Update to android 14

Author: renefloor

.github/workflows/build_android_store.yaml

@@ -21,12 +21,19 @@ jobs:
       ANDROID_KEYSTORE_ALIAS: upload
       ANDROID_KEYSTORE_PRIVATE_KEY_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PW }}
       ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PW }}
+      JAVA_VERSION: "17.x"
+      JAVA_DISTRIBUTION: "zulu"
     steps:
       - uses: actions/checkout@v2
 
+      - uses: actions/setup-java@v3
+        with:
+          java-version: ${{ env.JAVA_VERSION }}
+          distribution: ${{ env.JAVA_DISTRIBUTION }}
+
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: 3.16.0
+          flutter-version: 3.16.2
           channel: stable
           cache: true
 

.github/workflows/build_microsoft_store.yaml

@@ -22,7 +22,7 @@ jobs:
 
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: 3.16.0
+          flutter-version: 3.16.2
           channel: stable
           cache: true
 

.github/workflows/deploy.yaml

@@ -24,7 +24,7 @@ jobs:
 
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: 3.16.0
+          flutter-version: 3.16.2
           channel: stable
           cache: true
 
@@ -65,7 +65,7 @@ jobs:
 
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: 3.16.0
+          flutter-version: 3.16.2
           channel: stable
           cache: true
 

.github/workflows/deploy_develop.yaml

@@ -23,7 +23,7 @@ jobs:
 
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: 3.16.0
+          flutter-version: 3.16.2
           channel: stable
           cache: true
 

.github/workflows/pr_preview.yaml

@@ -20,7 +20,7 @@ jobs:
 
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: 3.16.0
+          flutter-version: 3.16.2
           channel: stable
           cache: true
 

android/app/build.gradle

@@ -27,12 +27,37 @@ if (keystorePropertiesFile.exists()) {
     keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 }
 
+def signingKeyStorePassword = keystoreProperties.getProperty('storePassword')
+if (signingKeyStorePassword == null) {
+    signingKeyStorePassword = System.getenv('ANDROID_KEYSTORE_PASSWORD')
+}
+
+def signingKeyAlias = keystoreProperties.getProperty('keyAlias')
+if (signingKeyAlias == null) {
+    signingKeyAlias = System.getenv("ANDROID_KEYSTORE_ALIAS")
+}
+
+def signingKeyPassword = keystoreProperties.getProperty('keyPassword')
+if (signingKeyPassword == null) {
+    signingKeyPassword = System.getenv('ANDROID_KEYSTORE_PRIVATE_KEY_PASSWORD')
+}
+
+def signingKeyStoreFilePath = keystoreProperties.getProperty('storeFile')
+if (signingKeyStoreFilePath == null) {
+    signingKeyStoreFilePath = System.getenv("ANDROID_KEYSTORE_PATH")
+}
+if (signingKeyStoreFilePath == null) {
+    signingKeyStoreFilePath = "../island-puzzle.jks"
+}
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 31
+    namespace "nl.renefloor.puzzle"
+    compileSdkVersion 34
+    ndkVersion "25.1.8937393"
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -49,8 +74,8 @@ android {
 
     defaultConfig {
         applicationId "nl.renefloor.puzzle"
-        minSdkVersion 16
-        targetSdkVersion 30
+        minSdkVersion 21
+        targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
@@ -62,28 +87,18 @@ android {
     }
 
     signingConfigs {
-        if (System.getenv("ANDROID_KEYSTORE_PATH")) {
-            release {
-                storeFile file(System.getenv("ANDROID_KEYSTORE_PATH"))
-                keyAlias System.getenv("ANDROID_KEYSTORE_ALIAS")
-                keyPassword System.getenv("ANDROID_KEYSTORE_PRIVATE_KEY_PASSWORD")
-                storePassword System.getenv("ANDROID_KEYSTORE_PASSWORD")
-            }
-        } else {
-            release {
-                keyAlias keystoreProperties['keyAlias']
-                keyPassword keystoreProperties['keyPassword']
-                storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
-                storePassword keystoreProperties['storePassword']
-            }
+        release {
+            storeFile file(signingKeyStoreFilePath)
+            storePassword signingKeyStorePassword
+            keyAlias signingKeyAlias
+            keyPassword signingKeyPassword
         }
     }
 
     buildTypes {
         release {
             signingConfig signingConfigs.release
             minifyEnabled true
-            useProguard true
             proguardFiles getDefaultProguardFile('proguard-android.txt')
         }
         debug {

android/app/src/main/AndroidManifest.xml

@@ -10,6 +10,7 @@
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
+            android:exported="true"
             android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user

android/build.gradle

@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.9.21'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:8.1.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -24,6 +24,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Jun 23 08:50:38 CEST 2017
+#Mon Dec 04 20:44:16 CET 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip