Modernize project to match skip-generated template

Author: marcprux

.gitignore

@@ -60,16 +60,9 @@ Package.resolved
 Carthage/Build/
 
 # fastlane
-#
-# It is recommended to not store the screenshots in the git repo.
-# Instead, use fastlane to re-generate the screenshots whenever they are needed.
-# For more information about the recommended setup visit:
-# https://docs.fastlane.tools/best-practices/source-control/#source-control
 
 **/fastlane/apikey.json
 **/fastlane/report.xml
 **/fastlane/README.md
 **/fastlane/Preview.html
-**/fastlane/screenshots/**/*.png
-**/fastlane/metadata/android/*/images/**/*.png
 **/fastlane/test_output

Android/app/build.gradle.kts

@@ -10,16 +10,19 @@ plugins {
 skip {
 }
 
+kotlin {
+    compilerOptions {
+        jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(libs.versions.jvm.get().toString())
+    }
+}
+
 android {
     namespace = group as String
     compileSdk = libs.versions.android.sdk.compile.get().toInt()
     compileOptions {
         sourceCompatibility = JavaVersion.toVersion(libs.versions.jvm.get())
         targetCompatibility = JavaVersion.toVersion(libs.versions.jvm.get())
     }
-    kotlinOptions {
-        jvmTarget = libs.versions.jvm.get().toString()
-    }
     packaging {
         jniLibs {
             keepDebugSymbols.add("**/*.so")
@@ -41,16 +44,23 @@ android {
     }
 
     // default signing configuration tries to load from keystore.properties
+    // see: https://skip.tools/docs/deployment/#export-signing
     signingConfigs {
         val keystorePropertiesFile = file("keystore.properties")
-        if (keystorePropertiesFile.isFile) {
-            create("release") {
+        create("release") {
+            if (keystorePropertiesFile.isFile) {
                 val keystoreProperties = Properties()
                 keystoreProperties.load(keystorePropertiesFile.inputStream())
                 keyAlias = keystoreProperties.getProperty("keyAlias")
                 keyPassword = keystoreProperties.getProperty("keyPassword")
                 storeFile = file(keystoreProperties.getProperty("storeFile"))
                 storePassword = keystoreProperties.getProperty("storePassword")
+            } else {
+                // when there is no keystore.properties file, fall back to signing with debug config
+                keyAlias = signingConfigs.getByName("debug").keyAlias
+                keyPassword = signingConfigs.getByName("debug").keyPassword
+                storeFile = signingConfigs.getByName("debug").storeFile
+                storePassword = signingConfigs.getByName("debug").storePassword
             }
         }
     }

Android/app/src/main/kotlin/app/droid/Main.kt

@@ -70,7 +70,7 @@ open class MainActivity: AppCompatActivity {
         //ActivityCompat.requestPermissions(self, permissions.toTypedArray(), requestTag)
     }
 
-    override fun onSaveInstanceState(bundle: android.os.Bundle): Unit = super.onSaveInstanceState(bundle)
+    override fun onSaveInstanceState(outState: android.os.Bundle): Unit = super.onSaveInstanceState(outState)
 
     override fun onRestoreInstanceState(bundle: android.os.Bundle) {
         // Usually you restore your state in onCreate(). It is possible to restore it in onRestoreInstanceState() as well, but not very common. (onRestoreInstanceState() is called after onStart(), whereas onCreate() is called before onStart().