Merge branch '2485-rename_release_types' into 'main' (2e9e28a7) · Commits · e / os / App Lounge

.gitlab-ci.yml

+25 −27

Original line number	Diff line number	Diff line
		@@ -4,9 +4,9 @@ variables:
		SENTRY_DSN: $SENTRY_DSN
		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"
		UNSIGNED_APK: "AppLounge_release.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:
		@@ -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
		@@ -221,26 +219,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 +256,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 +278,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"

app/build.gradle

+8 −8

Original line number	Diff line number	Diff line
		@@ -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'
		}

app/src/main/java/foundation/e/apps/data/gitlab/UpdatableSystemAppsApi.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@ interface UpdatableSystemAppsApi {
		}
		}

		@GET("{endPoint}?inline=false")
		@GET("{endPoint}")
		suspend fun getUpdatableSystemApps(
		@Path("endPoint") endPoint: EndPoint = EndPoint.ENDPOINT_RELEASE
		): Response<List<SystemAppProject>>