Merge branch 'release/1.2.7'

mshdabiola · Jun 26, 2024 · 9499c6d · 9499c6d
2 parents f4337ef + 215765b
commit 9499c6d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/.github/workflows/deploy_foss_to_github.yml b/.github/workflows/deploy_foss_to_github.yml
@@ -41,10 +41,9 @@ jobs:
 
       - name: Remove Firebase References
         run: |
-            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
             sed -i -e '/androidx.dev/d' settings.gradle.kts
-            sed -i -e '/mlkit/,+14d' -e '/google-services/d' -e '/libs.firebase/d' build-logic/convention/build.gradle.kts
+            sed -i -e '/with(target) {/,/^        }/d' -e '/CrashlyticsExtension/d' build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt
+            sed -i -e '/libs.firebase/d' build-logic/convention/build.gradle.kts
 
       - name: Generate Release APK
         run: ./gradlew assembleFossReliantRelease

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -76,8 +76,8 @@ playServicesMlkitTextRecognition = "19.0.0"
 ktor = "2.3.11"
 uiTextGoogleFonts = "1.6.8"
 
-versionName = "1.2.6"
-versionCode = "126"
+versionName = "1.2.7"
+versionCode = "127"
 
 telephoto = "0.11.2"
 lottieCompose = "6.4.0"

diff --git a/instuctions b/instuctions
@@ -11,3 +11,12 @@
     ./gradlew :app:generateReleaseBaselineProfile
 
 ./gradlew pixel6api33FossReliantBenchmarkBenchmarkAndroidTest
+
+      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
+      sed -i -e '/androidx.dev/d' settings.gradle.kts
+      sed -i -e '/mlkit/,+14d' -e '/google-services/d' -e '/libs.firebase/d' build-logic/convention/build.gradle.kts
+
+      sed -i -e '/androidx.dev/d' settings.gradle.kts
+      sed -i -e '/with(target) {/,/^        }/d' -e '/CrashlyticsExtension/d' build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt
+      sed -i -e '/libs.firebase/d' build-logic/convention/build.gradle.kts