From 137bfad0001106b8f91baf38e80b423f2ff3a429 Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Wed, 14 Jan 2026 21:04:42 +0530 Subject: [PATCH 1/5] Add elib dependency --- build.gradle.kts | 2 ++ settings.gradle.kts | 1 + 2 files changed, 3 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index 32aa68f..22db3fb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -64,6 +64,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 { diff --git a/settings.gradle.kts b/settings.gradle.kts index b29d606..0481d51 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -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") } } -- GitLab From b72e6d5bd7ad6b7dd747e3c1469f9ad12ac0d702 Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Wed, 14 Jan 2026 21:06:45 +0530 Subject: [PATCH 2/5] sign with aosp testkey --- build.gradle.kts | 13 +++++++++++++ keystore/testkey.jks | Bin 0 -> 3050 bytes 2 files changed, 13 insertions(+) create mode 100644 keystore/testkey.jks diff --git a/build.gradle.kts b/build.gradle.kts index 22db3fb..fb26b0e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -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 @@ -43,6 +54,8 @@ android { getByName("debug") { // Append .dev to package name so we won't conflict with AOSP build. applicationIdSuffix = ".dev" + + signingConfig = signingConfigs.getByName("testkey") } } compileOptions { diff --git a/keystore/testkey.jks b/keystore/testkey.jks new file mode 100644 index 0000000000000000000000000000000000000000..f8e2054d1569c252e29ec38ddf557234164c2534 GIT binary patch literal 3050 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 Lqw+xsRAd7Hw0o2I literal 0 HcmV?d00001 -- GitLab From 8a69ec79d33bb6d9ea6acaf832b6db65a2b9fb1b Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Wed, 14 Jan 2026 21:07:21 +0530 Subject: [PATCH 3/5] ci: update --- .gitlab-ci.yml | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5150363..5e70db8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,11 +1,33 @@ +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 -- GitLab From 63e2d58e5f3f0ddefd2a95901b0a40e84e625636 Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Wed, 14 Jan 2026 21:07:47 +0530 Subject: [PATCH 4/5] keep same package name for debug build type --- build.gradle.kts | 3 --- 1 file changed, 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index fb26b0e..104749c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -52,9 +52,6 @@ android { ) } getByName("debug") { - // Append .dev to package name so we won't conflict with AOSP build. - applicationIdSuffix = ".dev" - signingConfig = signingConfigs.getByName("testkey") } } -- GitLab From ac58d1aee0077f55d8e1f68c90e965e012457c04 Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Wed, 14 Jan 2026 21:18:08 +0530 Subject: [PATCH 5/5] fix dialog not following our palette --- res/values/themes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values/themes.xml b/res/values/themes.xml index 6aa902c..88edad8 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -16,7 +16,7 @@ -- GitLab