Update CHANGELOG and simplify versionCode calculation (#134)

* Simplify versionCode calculation

* Update CHANGELOG

.github/workflows/publish_play_store_update.yaml

@@ -13,6 +13,9 @@ jobs:
     timeout-minutes: 10
     steps:
       - uses: actions/checkout@v3
+        # Fetch all history so that we can calculate the version code
+        with:
+          fetch-depth: 0
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
@@ -43,11 +46,18 @@ jobs:
         id: short_sha
         run: |
           echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+      - name: Calculate Version Code
+        id: version_code
+        run: |
+          VERSION_CODE=$(git rev-list --count HEAD)
+          echo "Version Code for this build is $VERSION_CODE"
+          echo "version_code=$VERSION_CODE" >> $GITHUB_OUTPUT
       - name: Assemble
         uses: gradle/gradle-build-action@v2
         with:
           arguments: bundleRelease
         env:
+          ORG_GRADLE_PROJECT_VERSION_CODE: ${{ steps.version_code.outputs.version_code }}
           ORG_GRADLE_PROJECT_SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
           ORG_GRADLE_PROJECT_uploadKeystorePassword: ${{ secrets.UPLOAD_KEYSTORE_PASSWORD }}
       - name: Deploy Sample App to Play Store Internal Testing Track

CHANGELOG.md

@@ -1,6 +1,16 @@
 # Changelog
 
-## 10.0.0-beta03 (Unreleased)
+## 10.0.0-beta04 (unreleased)
+
+### Added
+
+### Fixed
+
+### Changed
+
+### Removed
+
+## 10.0.0-beta03
 
 ### Added
 - Biometric KYC
@@ -15,17 +25,22 @@
 - Don't report IDE Jetpack Compose Preview crashes to Sentry
 
 ### Changed
-- Breaking: renamed SmartSelfie Registration to SmartSelfie Enrollment
-- Compile against API level 34
-- Bump AndroidX Activity to 1.7.2
-- Bump AndroidX Fragment to 1.6.0
-- Bump Gradle to 8.0.2
+- Breaking: Renamed SmartSelfie Registration to SmartSelfie Enrollment
+- Breaking: Removed "Screen" suffix from SmartSelfie Composables
 - Tweak selfie progress indicator animation
 - Minor update to default colors to add contrast
 - Submit color liveness images instead of grayscale 
 - Update SmartSelfie™ directives copy to be more succinct
 - Changed the order of arguments in Composables to ensure required arguments come first and so that
   Modifier is the first optional argument
+- Compile against API level 34
+- Bump Gradle to 8.0.2
+- Bump Kotlin to 1.8.22
+- Bump AndroidX Activity to 1.7.2
+- Bump AndroidX Fragment to 1.6.0
+- Bump Compose BOM to 2023.06.01
+- Bump Camposer to 0.2.2
+- Bump Sentry to 6.24
 
 ## 10.0.0-beta02
 

sample/sample.gradle.kts

@@ -1,7 +1,5 @@
 @file:Suppress("UnstableApiUsage")
 
-import java.io.ByteArrayOutputStream
-
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
@@ -17,7 +15,7 @@ android {
         applicationId = "com.smileidentity.sample"
         minSdk = 21
         targetSdk = 34
-        versionCode = numberOfCommitsOnMain
+        versionCode = findProperty("VERSION_CODE") as? Int ?: 1
         // Include the SDK version in the app version name
         versionName = "1.2.0_sdk-" + project(":lib").version.toString()
 
@@ -86,23 +84,6 @@ android {
     }
 }
 
-/**
- * The versionCode is calculated by the number of commits on the main branch. This fails on PRs,
- * but the versionCode is only relevant on main anyways, so return a default value of 1.
- */
-val numberOfCommitsOnMain: Int
-    get() = try {
-        val stdout = ByteArrayOutputStream()
-        project.exec {
-            commandLine("git", "rev-list", "--count", "main")
-            standardOutput = stdout
-        }
-        stdout.toString().trim().toInt()
-    } catch (e: Exception) {
-        println(e.message)
-        1
-    }
-
 val checkSmileConfigFileTaskName = "checkSmileConfigFile"
 tasks.register(checkSmileConfigFileTaskName) {
     doLast {