Merge branch 'release/1.2.4'

mshdabiola · Jun 13, 2024 · 1c48e6b · 1c48e6b
2 parents ca86669 + 91cfec3
commit 1c48e6b
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 5 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -20,8 +20,10 @@ android {
 
     defaultConfig {
         applicationId = "com.mshdabiola.playnotepad"
-        versionCode = 1
-        versionName = "0.0.1" // X.Y.Z; X = Major, Y = minor, Z = Patch level
+        versionCode = libs.versions.versionCode.get().toIntOrNull()
+        versionName = System.getenv("VERSION_NAME") ?: libs.versions.versionName.get()
+//        versionCode = 1
+//        versionName = "0.0.1" // X.Y.Z; X = Major, Y = minor, Z = Patch level
 
         // Custom test runner to set up Hilt dependency graph
         testInstrumentationRunner = "com.mshdabiola.testing.TestRunner"

diff --git a/app/fossReliantRelease-badging.txt b/app/fossReliantRelease-badging.txt
@@ -1,4 +1,4 @@
-package: name='com.mshdabiola.playnotepad.foss' versionCode='1' versionName='0.0.1-foss' platformBuildVersionName='14' platformBuildVersionCode='34' compileSdkVersion='34' compileSdkVersionCodename='14'
+package: name='com.mshdabiola.playnotepad.foss' versionCode='1' versionName='0.0.1' platformBuildVersionName='14' platformBuildVersionCode='34' compileSdkVersion='34' compileSdkVersionCodename='14'
 sdkVersion:'24'
 targetSdkVersion:'34'
 uses-permission: name='android.permission.RECORD_AUDIO'

diff --git a/build-logic/convention/src/main/kotlin/com/mshdabiola/app/Flavor.kt b/build-logic/convention/src/main/kotlin/com/mshdabiola/app/Flavor.kt
@@ -24,7 +24,7 @@ enum class Flavor(
 ) {
     //    demo(FlavorDimension.contentType, applicationIdSuffix = ".demo", "-demo"),
 //    prod(FlavorDimension.contentType),
-    fossReliant(FlavorDimension.store,applicationIdSuffix=".foss","-foss"),
+    fossReliant(FlavorDimension.store,applicationIdSuffix=".foss"),
     googlePlay(FlavorDimension.store, applicationIdSuffix = ".play", versionNameSuffix = "-play")
 }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,6 +2,9 @@
 agp = "8.4.1"
 androidTools = "31.3.2"
 
+versionName = "0.0.1"
+versionCode = "1"
+
 accompanist = "0.34.0"
 
 guava = "33.0.0-android"

diff --git a/instuctions b/instuctions
@@ -10,3 +10,7 @@
 
     ./gradlew :app:generateReleaseBaselineProfile
 
+            sed -i -e '/google-services/d' -e '/firebase/d' ../build.gradle.kts;
+            sed -i -e '/mlkit/,+14d' -e '/google-services/d' -e '/firebase/d' build.gradle.kts;
+            sed -i -e '/with(target) {/,/^        }/d' -e '/CrashlyticsExtension/d' build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt
+
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -12,7 +12,6 @@ dependencyResolutionManagement {
         google()
         mavenCentral()
         maven(url = "https://androidx.dev/storage/compose-compiler/repository/")
-
     }
 }
 rootProject.name = "NotePad"