Release: v4.17.2

Part of #418.

.github/workflows/build_apk.yml

@@ -22,7 +22,7 @@ jobs:
         shell: bash
         run: |
           echo ${NIGHTLY_STORE_FILE} | base64 -d > KEY_NIGHTLY.jks
-          ./gradlew assembleNightly -Dnightly_store_file=KEY_NIGHTLY.jks -Dnightly_store_password="${NIGHTLY_STORE_PASSWORD}" -Dnightly_key_alias="${NIGHTLY_KEY_ALIAS}" -Dnightly_key_password="${NIGHTLY_STORE_PASSWORD}"
+          ./gradlew assembleNightlyRelease -Dnightly_store_file=KEY_NIGHTLY.jks -Dnightly_store_password="${NIGHTLY_STORE_PASSWORD}" -Dnightly_key_alias="${NIGHTLY_KEY_ALIAS}" -Dnightly_key_password="${NIGHTLY_STORE_PASSWORD}"
         env:
           NIGHTLY_STORE_FILE: ${{ secrets.NIGHTLY_STORE_FILE }}
           NIGHTLY_STORE_PASSWORD: ${{ secrets.NIGHTLY_STORE_PASSWORD }}

build.gradle

@@ -63,25 +63,25 @@ android {
     }
 
     defaultConfig {
-        applicationId "de.dennisguse.opentracks"
+        applicationId 'de.dennisguse.opentracks'
-        versionCode 5975
+        versionCode 5980
-        versionName "v4.17.0"
+        versionName "v4.17.2"
 
         buildConfigField "String", "VERSION_NAME_FULL", "\"${getVersionName()}\""
 
         minSdk 26
         targetSdk 35
 
-        testInstrumentationRunner "de.dennisguse.opentracks.TestRunner"
+        testInstrumentationRunner 'de.dennisguse.opentracks.TestRunner'
         testInstrumentationRunnerArguments clearPackageData: 'true'
     }
     signingConfigs {
         nightly {
-            if (System.getProperty("nightly_store_file") != null) {
+            if (System.getProperty('nightly_store_file') != null) {
-                storeFile file(System.getProperty("nightly_store_file"))
+                storeFile file(System.getProperty('nightly_store_file'))
-                storePassword System.getProperty("nightly_store_password")
+                storePassword System.getProperty('nightly_store_password')
-                keyAlias System.getProperty("nightly_key_alias")
+                keyAlias System.getProperty('nightly_key_alias')
-                keyPassword System.getProperty("nightly_key_password")
+                keyPassword System.getProperty('nightly_key_password')
             }
         }
     }
@@ -90,42 +90,58 @@ android {
 
     buildTypes {
         debug {
-            applicationIdSuffix ".debug"
+            applicationIdSuffix '.debug'
-            versionNameSuffix "-debug"
+            versionNameSuffix '-debug'
         }
-
-        nightly {
-            signingConfig signingConfigs.nightly
-            applicationIdSuffix ".nightly"
-        }
-
         release {
             crunchPngs false
             minifyEnabled false
         }
+    }
 
-        releasePlayStore {
+
-            applicationIdSuffix ".playstore"
+    flavorDimensions 'version'
-            versionNameSuffix "-PlayStore"
+    productFlavors {
-            signingConfig signingConfigs.debug
+        nightly {
+            dimension 'version'
+            applicationIdSuffix '.nightly'
+            signingConfig signingConfigs.nightly
+        }
+        irreproducible {
+            // Non-reproducible: https://f-droid.org/de/packages/de.dennisguse.opentracks/
+            dimension 'version'
+            applicationId 'de.dennisguse.opentracks'
+            versionNameSuffix 'irreproducible'
+        }
+         reproducible {
+            // Developer Binaries: https://github.com/OpenTracksApp/OSMDashboard/releases/download/v%v/de.dennisguse.opentracks.playstore_%v.apk
+            // FDroid: https://f-droid.org/de/packages/de.dennisguse.opentracks.playstore
+            // PlayStore: https://play.google.com/store/apps/details?id=de.dennisguse.opentracks.playstore
+            dimension 'version'
+            applicationId 'de.dennisguse.opentracks.playstore'
         }
     }
 
     applicationVariants.configureEach { variant ->
-        variant.resValue "string", "applicationId", variant.applicationId
+        variant.resValue 'string', 'applicationId', variant.applicationId
 
-        if (variant.buildType.name == 'nightly') {
+        variant.outputs.configureEach {
-            variant.outputs.configureEach {
+            if (variant.buildType.name == 'reproducible') {
+                outputFileName = '${applicationId}_${variant.buildType.name}_${variant.versionName}.apk'
+            } else {
+                outputFileName = '${applicationId}_${variant.buildType.name}_${variant.versionCode}.apk'
+            }
+
+            if (variant.buildType.name == 'nightly') {
                 setVersionCodeOverride(getVersionCode())
                 setVersionNameOverride(getVersionName())
-                outputFileName = "${applicationId}_${variant.versionCode}.apk"
             }
         }
     }
 }
 
 dependencies {
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.3'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
 
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.preference:preference:1.2.1'

fastlane/metadata/android/en-US/changelogs/5978.txt

@@ -0,0 +1,5 @@
+v4.17.1: OpenTracks
+
+Changes:
+- Reproducible build: let's see if it works.
+  The PlayStore variant will be submitted to F-Droid, verified and published them.

fastlane/metadata/android/en-US/changelogs/5980.txt

@@ -0,0 +1,9 @@
+v4.17.2: OpenTracks
+
+Changes:
+- Reproducible build: let's see if it works.
+  The PlayStore variant will be submitted to F-Droid, verified and published them.
+
+Developer:
+- F-Droid requires to use Product Flavors (instead of Build Types)
+