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

Commit 7a482031 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch '3791-main-prebuilt' into 'main' 

Move to a single branch for all android versions

See merge request !43
parents 93220728 ac58d1ae

.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.2

    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.kts

+14 −2
Original line number Diff line number Diff line
@@ -24,11 +24,22 @@ android { 
        versionName = "1.0"

    }



    signingConfigs {

        create("testkey") {

            storeFile = File("${rootDir}/keystore/testkey.jks")

            storePassword = "testkey"

            keyAlias = "testkey"

            keyPassword = "testkey"

        }

    }



    buildTypes {

        getByName("release") {

            // Enables code shrinking, obfuscation, and optimization.

            isMinifyEnabled = true



            signingConfig = signingConfigs.getByName("testkey")



            // Enables resource shrinking.

            isShrinkResources = true
@@ -41,8 +52,7 @@ android { 
            )

        }

        getByName("debug") {

            // Append .dev to package name so we won't conflict with AOSP build.

            applicationIdSuffix = ".dev"

            signingConfig = signingConfigs.getByName("testkey")

        }

    }

    compileOptions {
@@ -64,6 +74,8 @@ dependencies { 
    implementation("androidx.webkit:webkit:1.7.0-alpha02")

    implementation("com.google.android.material:material:1.11.0")

    implementation("com.hp:crcalc:1.0")



    implementation("foundation.e:elib:0.0.1-alpha11")

}



configure<GenerateBpPluginExtension> {

keystore/testkey.jks

0 → 100644
+2.98 KiB

File added.

No diff preview for this file type.

View file

res/values/themes.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


    <style name="ThemeOverlay.App.MaterialAlertDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog">

        <item name="elevationOverlayEnabled">false</item>

        <item name="colorSurface">@color/e_floating_background</item>

        <item name="colorSurfaceContainerHigh">@color/e_floating_background</item>

        <item name="buttonBarPositiveButtonStyle">@style/Widget.App.Button</item>

        <item name="buttonBarNegativeButtonStyle">@style/Widget.App.Button</item>

    </style>

settings.gradle.kts

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ dependencyResolutionManagement { 
        google()

        mavenCentral()

        maven("https://raw.githubusercontent.com/lineage-next/crcalc/main/.m2")

        maven("https://gitlab.e.foundation/api/v4/groups/9/-/packages/maven")

    }

}