From 0ea0a9acd3bf05fb7cf1d3e77d851e63196c0cc1 Mon Sep 17 00:00:00 2001 From: Sayantan Roychowdhury Date: Tue, 3 Sep 2024 17:36:58 +0530 Subject: [PATCH 1/6] build.gradle build variant renames --- app/build.gradle | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 65fefad01..0e08d499f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -70,13 +70,13 @@ android { keyAlias 'platform' keyPassword 'android' } - releaseDevConfig { + releaseCommunityConfig { storeFile file("../keystore/proprietary.keystore") storePassword keystore_password keyAlias 'platform.dev' keyPassword keystore_password } - releaseStableConfig { + releaseOfficialConfig { storeFile file("../keystore/proprietary.keystore") storePassword keystore_password keyAlias 'platform.stable' @@ -88,11 +88,11 @@ android { debug { manifest.srcFile 'src/debug/AndroidManifest.xml' } - releaseDev { + releaseCommunity { manifest.srcFile 'src/release/AndroidManifest.xml' java.srcDirs = ['src/release/java'] } - releaseStable { + releaseOfficial { manifest.srcFile 'src/release/AndroidManifest.xml' java.srcDirs = ['src/release/java'] } @@ -109,15 +109,15 @@ android { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } - releaseDev { + releaseCommunity { minifyEnabled false - signingConfig signingConfigs.releaseDevConfig + signingConfig signingConfigs.releaseCommunityConfig sourceSets proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } - releaseStable { + releaseOfficial { minifyEnabled false - signingConfig signingConfigs.releaseStableConfig + signingConfig signingConfigs.releaseOfficialConfig proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } -- GitLab From fdff0a5ca15fde644a16236b9ac63b72394c007e Mon Sep 17 00:00:00 2001 From: Sayantan Roychowdhury Date: Tue, 3 Sep 2024 17:37:24 +0530 Subject: [PATCH 2/6] gitlab ci name changes --- .gitlab-ci.yml | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 66b2941e7..d80cd53cb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,8 +5,8 @@ variables: PROJECT_ID: "355" # under Settings -> General APK_PATH: "apks" UNSIGNED_APK: "AppLounge-release.apk" - DEV_APK: "AppLounge-release-dev.apk" - STABLE_APK: "AppLounge-release-stable.apk" + COMMUNITY_APK: "AppLounge-release-community.apk" + OFFICIAL_APK: "AppLounge-release-official.apk" stages: - debug @@ -98,21 +98,21 @@ buildRelease: - if: '$CI_COMMIT_REF_PROTECTED == "true"' when: always -buildReleaseDev: +buildReleaseCommunity: extends: .releaseSigned script: - - ./gradlew assembleReleaseDev + - ./gradlew assembleReleaseCommunity artifacts: paths: - - app/build/outputs/apk/releaseDev/ + - app/build/outputs/apk/releaseCommunity/ -buildReleaseStable: +buildReleaseOfficial: extends: .releaseSigned script: - - ./gradlew assembleReleaseStable + - ./gradlew assembleReleaseOfficial artifacts: paths: - - app/build/outputs/apk/releaseStable/ + - app/build/outputs/apk/releaseOfficial/ # Default lint configuration for release jobs .lintReleaseDefault: @@ -221,26 +221,26 @@ generate-apks: needs: - init-submodules - buildRelease - - buildReleaseDev - - buildReleaseStable + - buildReleaseCommunity + - buildReleaseOfficial dependencies: - init-submodules - buildRelease - - buildReleaseDev - - buildReleaseStable + - buildReleaseCommunity + - buildReleaseOfficial script: - mkdir -p $APK_PATH - unsignedApk=$(ls app/build/outputs/apk/release/*.apk | grep "release") - - devApk=$(ls app/build/outputs/apk/releaseDev/*.apk | grep "releaseDev") - - stableApk=$(ls app/build/outputs/apk/releaseStable/*.apk | grep "releaseStable") + - communityApk=$(ls app/build/outputs/apk/releaseCommunity/*.apk | grep "releaseCommunity") + - officialApk=$(ls app/build/outputs/apk/releaseOfficial/*.apk | grep "releaseOfficial") - cp "$unsignedApk" "$APK_PATH/$UNSIGNED_APK" - - cp "$devApk" "$APK_PATH/$DEV_APK" - - cp "$stableApk" "$APK_PATH/$STABLE_APK" + - cp "$communityApk" "$APK_PATH/$COMMUNITY_APK" + - cp "$officialApk" "$APK_PATH/$OFFICIAL_APK" artifacts: paths: - $APK_PATH/$UNSIGNED_APK - - $APK_PATH/$DEV_APK - - $APK_PATH/$STABLE_APK + - $APK_PATH/$COMMUNITY_APK + - $APK_PATH/$OFFICIAL_APK create-json-files: stage: gitlab_release @@ -258,11 +258,11 @@ create-json-files: script: - | ./systemAppsUpdateInfo/scripts/create-json-files.sh \ - "$APK_PATH" "$UNSIGNED_APK" "$DEV_APK" "$STABLE_APK" + "$APK_PATH" "$UNSIGNED_APK" "$COMMUNITY_APK" "$OFFICIAL_APK" artifacts: paths: - - dev.json - - stable.json + - community.json + - official.json create-release: stage: gitlab_release @@ -280,4 +280,4 @@ create-release: script: - | ./systemAppsUpdateInfo/scripts/create-release.sh \ - "$APK_PATH" "$UNSIGNED_APK" "$DEV_APK" "$STABLE_APK" \ No newline at end of file + "$APK_PATH" "$UNSIGNED_APK" "$COMMUNITY_APK" "$OFFICIAL_APK" \ No newline at end of file -- GitLab From ff42ab3438aade5cb42830c31f7726720a4d74a4 Mon Sep 17 00:00:00 2001 From: Sayantan Roychowdhury Date: Tue, 3 Sep 2024 17:45:44 +0530 Subject: [PATCH 3/6] add newline --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d80cd53cb..af138e87b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -280,4 +280,4 @@ create-release: script: - | ./systemAppsUpdateInfo/scripts/create-release.sh \ - "$APK_PATH" "$UNSIGNED_APK" "$COMMUNITY_APK" "$OFFICIAL_APK" \ No newline at end of file + "$APK_PATH" "$UNSIGNED_APK" "$COMMUNITY_APK" "$OFFICIAL_APK" -- GitLab From dc48880d1bb8103ab63e9266991a7e2481f0c00e Mon Sep 17 00:00:00 2001 From: Sayantan Roychowdhury Date: Wed, 4 Sep 2024 02:00:33 +0530 Subject: [PATCH 4/6] use clone instead of submodule --- .gitlab-ci.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index af138e87b..7bb35d880 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -206,12 +206,10 @@ init-submodules: - if: '$CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true"' when: on_success script: - - | - git submodule add --force \ - https://gitlab.e.foundation/e/os/system-apps-update-info.git systemAppsUpdateInfo + - git clone https://gitlab.e.foundation/e/os/system-apps-update-info.git systemAppsUpdateInfo artifacts: paths: - - systemAppsUpdateInfo/ + - systemAppsUpdateInfo/scripts/ generate-apks: stage: gitlab_release -- GitLab From 00ca32e102c7b44396e81a0d0e32cf2f4fbfa6fc Mon Sep 17 00:00:00 2001 From: Sayantan Roychowdhury Date: Wed, 4 Sep 2024 03:18:24 +0530 Subject: [PATCH 5/6] remove inline=false --- .../foundation/e/apps/data/gitlab/UpdatableSystemAppsApi.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/foundation/e/apps/data/gitlab/UpdatableSystemAppsApi.kt b/app/src/main/java/foundation/e/apps/data/gitlab/UpdatableSystemAppsApi.kt index 7053450f2..c42ec6a64 100644 --- a/app/src/main/java/foundation/e/apps/data/gitlab/UpdatableSystemAppsApi.kt +++ b/app/src/main/java/foundation/e/apps/data/gitlab/UpdatableSystemAppsApi.kt @@ -38,7 +38,7 @@ interface UpdatableSystemAppsApi { } } - @GET("{endPoint}?inline=false") + @GET("{endPoint}") suspend fun getUpdatableSystemApps( @Path("endPoint") endPoint: EndPoint = EndPoint.ENDPOINT_RELEASE ): Response> -- GitLab From 8777cf0447f7f4d44ac1396e793f9f87813e5bcf Mon Sep 17 00:00:00 2001 From: Sayantan Roychowdhury Date: Wed, 4 Sep 2024 15:25:46 +0530 Subject: [PATCH 6/6] refactor: use underscores in APK names refactor: use underscores in APK names --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7bb35d880..b5f2b52c2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,9 +4,9 @@ variables: SENTRY_DSN: $SENTRY_DSN PROJECT_ID: "355" # under Settings -> General APK_PATH: "apks" - UNSIGNED_APK: "AppLounge-release.apk" - COMMUNITY_APK: "AppLounge-release-community.apk" - OFFICIAL_APK: "AppLounge-release-official.apk" + UNSIGNED_APK: "AppLounge_release.apk" + COMMUNITY_APK: "AppLounge_release_community.apk" + OFFICIAL_APK: "AppLounge_release_official.apk" stages: - debug -- GitLab