Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c28568c1 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch '3790-main-prebuilt' into 'main' 

Move to single branch for all Android versions

See merge request !57
parents 5befd5de d542a8ba

.gitlab-ci.yml

+29 −7
Original line number Diff line number Diff line 
image: "registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:latest"



stages:

  - auto-merge-main

  - build

  - update-from-upstream



include:

  - project: 'e/templates'

    ref: master

    file: '/gitlab-ci/.gitlab-ci-auto-merge-main.yml'

  - project: 'e/templates'

    ref: master

    file: '/gitlab-ci/.gitlab-ci-import-updates-from-upstream.yml'
 
  - project: "e/templates"

    ref: main

    file: "/.gitlab/gitlab-ci/gitlab-ci-import-updates-from-upstream.yml"



main:

  extends: .update-from-upstream

  variables:

    UPSTREAM_BRANCH: lineage-23.0

    LOCAL_BRANCH: main



before_script:

  - export GRADLE_USER_HOME=$(pwd)/.gradle

  - chmod +x ./gradlew



cache:

  key: ${CI_PROJECT_ID}

  paths:

    - .gradle/



build:

  stage: build

  script:

    - ./gradlew assemble

  artifacts:

    paths:

      - build/outputs/apk

build.gradle

+22 −0
Original line number Diff line number Diff line
@@ -11,6 +11,27 @@ android { 
        targetSdkVersion 34

    }



    signingConfigs {

        testkey {

            storeFile file("keystore/testkey.jks")

            storePassword "testkey"

            keyAlias "testkey"

            keyPassword "testkey"

        }

    }



    buildTypes {

        debug {

            signingConfig = signingConfigs.testkey

        }

        release {

            signingConfig = signingConfigs.testkey

            minifyEnabled = true

            shrinkResources = true

            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard.flags'

        }

    }



    sourceSets {

        main {

            res.srcDirs = ['res']
@@ -49,6 +70,7 @@ dependencies { 
    implementation 'androidx.test:core:1.5.0'

    implementation 'androidx.test:rules:1.5.0'

    testImplementation 'junit:junit:4.13.2'

    implementation 'foundation.e:elib:0.0.1-alpha11'

}



tasks.withType(JavaCompile) {

keystore/testkey.jks

0 → 100644
+2.98 KiB

File added.

No diff preview for this file type.

View file

res/layout/alarm_volume_preference.xml

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
                android:layout_weight="1"

                android:paddingStart="12dp"

                android:singleLine="true"

                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"

                android:textAppearance="@style/TextAppearance.AppCompat.Subhead"

                android:textColor="?android:attr/textColorPrimary"

                android:ellipsize="marquee"

                android:fadingEdge="horizontal"/>

settings.gradle

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ dependencyResolutionManagement { 
    repositories {

        google()

        mavenCentral()

        maven{ url 'https://gitlab.e.foundation/api/v4/groups/9/-/packages/maven'}

    }

}

rootProject.name = "DeskClock"