Merge branch 'master' into '6042-master-reorg_crash' (51ad9891) · Commits · e / os / BlissLauncher

.gitlab-ci.yml

+29 −6

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

		variables:
		SENTRY_DSN: "${SENTRY_DSN}"

		stages:
		- check
		- build

		before_script:
		@@ -12,10 +16,29 @@ cache:
		paths:
		- .gradle/

		spotless:
		stage: check
		script:
		- ./gradlew spotlessCheck

		lint:
		stage: check
		script:
		- ./gradlew lint

		test:
		stage: build
		script:
		- ./gradlew test
		needs: [ "spotless", "lint" ]

		build:
		stage: build
		script:
		- ./gradlew build
		- ./gradlew assembleRelease
		needs: [ "spotless", "lint" ]
		artifacts:
		paths:
		- app/build/outputs/apk
		before_script:
		- sed -i 's/DEFAULT_OWM_KEY/'${DEFAULT_OWM_KEY}'/g' app/src/main/res/values/strings.xml

app/.gitignore

+1 −0

Original line number	Diff line number	Diff line
		/build
		google-services.json
		api*/

app/build.gradle.kts

+29 −5

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@ plugins {

		// Manifest version information
		val versionMajor = 1
		val versionMinor = 7
		val versionMinor = 8
		val versionPatch = 0

		val localProps = Properties()
		@@ -23,9 +23,9 @@ if (localPropsFile.exists()) {
		}

		val appendDebugSuffix = (localProps.getProperty("appendDebugSuffix") ?: "true").toBoolean()
		val keyStorePath = localProps.getProperty("keyStorePath") ?: "/keystore/debug.keystore"
		val keyStorePath = localProps.getProperty("keyStorePath") ?: "/keystore/platform.keystore"
		val keyStorePassword = localProps.getProperty("keyStorePassword") ?: "android"
		val signingKeyAlias = localProps.getProperty("keyAlias") ?: "androiddebugkey"
		val signingKeyAlias = localProps.getProperty("keyAlias") ?: "platform"
		val signingKeyPassword = localProps.getProperty("keyPassword") ?: "android"

		android {
		@@ -59,6 +59,16 @@ android {
		}
		signingConfig = signingConfigs.getByName("debug")
		}

		create("benchmark") {
		signingConfig = signingConfigs.getByName("debug")
		matchingFallbacks += listOf("release")
		isDebuggable = false
		}

		configureEach {
		buildConfigField("String", "SENTRY_DSN", "\"${System.getenv("SENTRY_DSN")}\"")
		}
		}

		signingConfigs {
		@@ -104,9 +114,20 @@ android {

		kotlinOptions { jvmTarget = "1.8" }

		buildFeatures { viewBinding = true }
		buildFeatures {
		viewBinding = true
		buildConfig = true
		}

		lint { abortOnError = false }
		lint {
		abortOnError = false
		checkReleaseBuilds = false
		warningsAsErrors = true
		disable.add("PluralsCandidate")
		disable.add("MissingTranslation")
		disable.add("UnusedResources")
		baseline = file("lint-baseline.xml")
		}
		}

		dependencies {
		@@ -148,6 +169,8 @@ dependencies {
		debugImplementation(libs.debug.db)
		debugImplementation(libs.whatthestack)
		coreLibraryDesugaring(libs.tools.desugar)
		implementation(libs.androidx.profileinstaller)
		debugImplementation(libs.tools.leakcanary)

		// Testing dependencies
		testImplementation(libs.bundles.testing.unit)
		@@ -155,4 +178,5 @@ dependencies {

		// elib
		implementation(libs.elib)
		implementation(libs.telemetry)
		}

app/lint-baseline.xml

0 → 100644

+2088 −0

File added.

Preview size limit exceeded, changes collapsed.

app/src/main/AndroidManifest.xml

+6 −3

Original line number	Diff line number	Diff line
		@@ -53,6 +53,7 @@
		android:supportsRtl="true"
		android:theme="@style/AppTheme"
		tools:ignore="AllowBackup,GoogleAppIndexingWarning">
		<profileable android:shell="true" />

		<!--
		Main launcher activity. When extending only change the name, and keep all the
		@@ -171,13 +172,15 @@
		android:name="android.nfc.disable_beam_default"
		android:value="true" />

		<receiver android:name="foundation.e.blisslauncher.features.weather.WeatherAppWidgetProvider"
		<receiver
		android:name="foundation.e.blisslauncher.features.weather.WeatherAppWidgetProvider"
		android:exported="false"
		android:label="@string/weather">
		<intent-filter>
		<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
		</intent-filter>
		<meta-data android:name="android.appwidget.provider"
		<meta-data
		android:name="android.appwidget.provider"
		android:resource="@xml/weather_appwidget_info" />
		</receiver>
		</application>