[BREAKING CHANGE] Upgrade Gradle, kotlin and Android target sdk versions

flutter_lyra/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.6.0
+
+- **BREAKING CHANGE**: [Android] Update min and compile SDK versions to match Flutter's
+- **FEAT** [Android] Upgrade Gradle version to 8.12
+- **FEAT** [Android] Upgrade Kotlin version to 2.1.0
+
 # 0.5.1
 
 - **FIX**: [Android] Fix kotlin compilation error

flutter_lyra/example/android/app/build.gradle.kts

@@ -0,0 +1,48 @@
+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")
+}
+
+android {
+    namespace = "tech.bam.flutter_lyra_example"
+    compileSdk = flutter.compileSdkVersion
+    ndkVersion = flutter.ndkVersion
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17.toString()
+    }
+
+    defaultConfig {
+        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
+        applicationId = "tech.bam.flutter_lyra_example"
+        // 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
+    }
+
+    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")
+        }
+    }
+}
+
+dependencies {
+    implementation("com.google.android.gms:play-services-wallet:19.4.0")
+}
+
+flutter {
+    source = "../.."
+}

flutter_lyra/example/android/app/proguard-rules.pro

@@ -0,0 +1,3 @@
+-dontwarn cards.pay.paycardsrecognizer.sdk.Card
+-dontwarn cards.pay.paycardsrecognizer.sdk.ScanCardIntent$Builder
+-dontwarn org.slf4j.impl.StaticLoggerBinder

flutter_lyra/example/android/app/src/debug/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.flutter_lyra_example">
+    package="tech.bam.flutter_lyra_example">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
-    <uses-permission android:name="android.permission.INTERNET"/>
-</manifest>
+    <uses-permission android:name="android.permission.INTERNET" />
+</manifest>

flutter_lyra/example/android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.flutter_lyra_example">
-   <application
+    package="tech.bam.flutter_lyra_example">
+    <application
         android:label="flutter_lyra_example"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
@@ -17,12 +17,12 @@
                  while the Flutter UI initializes. After that, this theme continues
                  to determine the Window background behind the Flutter UI. -->
             <meta-data
-              android:name="io.flutter.embedding.android.NormalTheme"
-              android:resource="@style/NormalTheme"
-              />
+                android:name="io.flutter.embedding.android.NormalTheme"
+                android:resource="@style/NormalTheme"
+            />
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
@@ -31,4 +31,4 @@
             android:name="flutterEmbedding"
             android:value="2" />
     </application>
-</manifest>
+</manifest>

flutter_lyra/example/android/app/src/main/kotlin/tech/bam/flutter_lyra_example/MainActivity.kt

@@ -0,0 +1,5 @@
+package tech.bam.flutter_lyra_example
+
+import io.flutter.embedding.android.FlutterFragmentActivity
+
+class MainActivity : FlutterFragmentActivity()

flutter_lyra/example/android/app/src/profile/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.flutter_lyra_example">
+    package="tech.bam.flutter_lyra_example">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
-    <uses-permission android:name="android.permission.INTERNET"/>
-</manifest>
+    <uses-permission android:name="android.permission.INTERNET" />
+</manifest>

flutter_lyra/example/android/build.gradle.kts

@@ -0,0 +1,24 @@
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+val newBuildDir: Directory =
+    rootProject.layout.buildDirectory
+        .dir("../../build")
+        .get()
+rootProject.layout.buildDirectory.value(newBuildDir)
+
+subprojects {
+    val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name)
+    project.layout.buildDirectory.value(newSubprojectBuildDir)
+}
+subprojects {
+    project.evaluationDependsOn(":app")
+}
+
+tasks.register<Delete>("clean") {
+    delete(rootProject.layout.buildDirectory)
+}

flutter_lyra/example/android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip

flutter_lyra/example/android/settings.gradle.kts

@@ -0,0 +1,26 @@
+pluginManagement {
+    val flutterSdkPath =
+        run {
+            val properties = java.util.Properties()
+            file("local.properties").inputStream().use { properties.load(it) }
+            val flutterSdkPath = properties.getProperty("flutter.sdk")
+            require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
+            flutterSdkPath
+        }
+
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
+
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+plugins {
+    id("dev.flutter.flutter-plugin-loader") version "1.0.0"
+    id("com.android.application") version "8.9.1" apply false
+    id("org.jetbrains.kotlin.android") version "2.1.0" apply false
+}
+
+include(":app")

flutter_lyra/example/ios/Runner.xcodeproj/project.pbxproj

@@ -366,7 +366,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterLyraExample;
+				PRODUCT_BUNDLE_IDENTIFIER = tech.bam.flutterLyraExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -496,7 +496,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterLyraExample;
+				PRODUCT_BUNDLE_IDENTIFIER = tech.bam.flutterLyraExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -520,7 +520,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterLyraExample;
+				PRODUCT_BUNDLE_IDENTIFIER = tech.bam.flutterLyraExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;

flutter_lyra/pubspec.yaml

@@ -1,7 +1,7 @@
 name: flutter_lyra
 description: This package allows you to use the methods from the lyra android and ios native sdks in Flutter
 
-version: 0.5.1
+version: 0.6.0
 
 homepage: https://github.com/bamlab/Flutter-Lyra
 repository: https://github.com/bamlab/Flutter-Lyra
@@ -22,9 +22,9 @@ dependencies:
   equatable: ^2.0.5
   flutter:
     sdk: flutter
-  flutter_lyra_android: ^0.5.1
-  flutter_lyra_ios: ^0.5.1
-  flutter_lyra_platform_interface: ^0.5.1
+  flutter_lyra_android: ^0.6.0
+  flutter_lyra_ios: ^0.6.0
+  flutter_lyra_platform_interface: ^0.6.0
 dev_dependencies:
   analyzer: ^4.7.0
   flutter_test:

flutter_lyra_android/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.6.0
+
+- **BREAKING CHANGE**: [Android] Update min and compile SDK versions to match Flutter's
+- **FEAT** [Android] Upgrade Gradle version to 8.12
+- **FEAT** [Android] Upgrade Kotlin version to 2.1.0
+
 # 0.5.1
 
 - **FIX**: [Android] Fix kotlin compilation error