Fix up metadata

1 files changed, 49 insertions, 60 deletions

diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index 9c87981..6291d2e 100755..100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -1,60 +1,49 @@
-import java.util.Properties

-import java.io.FileInputStream

-

-plugins {

-    id("com.android.application")

-    id("kotlin-android")

-    // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.

-    id("dev.flutter.flutter-gradle-plugin")

-}

-

-val keystoreProperties = Properties()

-val keystorePropertiesFile = rootProject.file("key.properties")

-if (keystorePropertiesFile.exists()) {

-    keystoreProperties.load(FileInputStream(keystorePropertiesFile))

-}

-

-android {

-    namespace = "com.botahamec.speedometer"

-    compileSdk = flutter.compileSdkVersion

-    ndkVersion = flutter.ndkVersion

-

-    compileOptions {

-        sourceCompatibility = JavaVersion.VERSION_11

-        targetCompatibility = JavaVersion.VERSION_11

-    }

-

-    kotlinOptions {

-        jvmTarget = JavaVersion.VERSION_11.toString()

-    }

-

-    defaultConfig {

-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).

-        applicationId = "com.botahamec.speedometer"

-        // You can update the following values to match your application needs.

-        // For more information, see: https://flutter.dev/to/review-gradle-config.

-        minSdk = flutter.minSdkVersion

-        targetSdk = flutter.targetSdkVersion

-        versionCode = flutter.versionCode

-        versionName = flutter.versionName

-    }

-

-    signingConfigs {

-        create("release") {

-            keyAlias = keystoreProperties["keyAlias"] as String

-            keyPassword = keystoreProperties["keyPassword"] as String

-            storeFile = keystoreProperties["storeFile"]?.let { file(it) }

-            storePassword = keystoreProperties["storePassword"] as String

-        }

-    }

-

-    buildTypes {

-        release {

-            signingConfig = signingConfigs.getByName("release")

-        }

-    }

-}

-

-flutter {

-    source = "../.."

-}

+plugins {
+    id("com.android.application")
+    // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
+    id("dev.flutter.flutter-gradle-plugin")
+}
+
+android {
+    namespace = "dev.botahamec.speedometer"
+    compileSdk = flutter.compileSdkVersion
+    ndkVersion = flutter.ndkVersion
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    defaultConfig {
+        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
+        applicationId = "dev.botahamec.speedometer"
+        // You can update the following values to match your application needs.
+        // For more information, see: https://flutter.dev/to/review-gradle-config.
+        minSdk = flutter.minSdkVersion
+        targetSdk = flutter.targetSdkVersion
+        // Uses the version code from pubspec.yaml. When using split APKs, 1000 * ABI_VERSION
+        // is added automatically by Flutter. (https://developer.android.com/studio/build/configure-apk-splits#configure-APK-versions)
+        // You can force using the value of versionCode by specifying the `-P force-version-code-ignoring-abi=true`
+        // flag during build.
+        versionCode = flutter.versionCode
+        versionName = flutter.versionName
+    }
+
+    buildTypes {
+        release {
+            // TODO: Add your own signing config for the release build.
+            // Signing with the debug keys for now, so `flutter run --release` works.
+            signingConfig = signingConfigs.getByName("debug")
+        }
+    }
+}
+
+kotlin {
+    compilerOptions {
+        jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
+    }
+}
+
+flutter {
+    source = "../.."
+}