diff --git a/flutter_lyra/CHANGELOG.md b/flutter_lyra/CHANGELOG.md
index b4d3337..d8d84c7 100644
--- a/flutter_lyra/CHANGELOG.md
+++ b/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
diff --git a/flutter_lyra/example/android/app/build.gradle b/flutter_lyra/example/android/app/build.gradle
deleted file mode 100644
index 684df94..0000000
--- a/flutter_lyra/example/android/app/build.gradle
+++ /dev/null
@@ -1,72 +0,0 @@
-def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
-if (localPropertiesFile.exists()) {
- localPropertiesFile.withReader('UTF-8') { reader ->
- localProperties.load(reader)
- }
-}
-
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
- throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
- flutterVersionCode = '1'
-}
-
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
- flutterVersionName = '1.0'
-}
-
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
-android {
- compileSdkVersion flutter.compileSdkVersion
- ndkVersion flutter.ndkVersion
-
- compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
- }
-
- kotlinOptions {
- jvmTarget = '1.8'
- }
-
- sourceSets {
- main.java.srcDirs += 'src/main/kotlin'
- }
-
- defaultConfig {
- // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
- applicationId "com.example.flutter_lyra_example"
- // You can update the following values to match your application needs.
- // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
- minSdkVersion 21
- targetSdkVersion flutter.targetSdkVersion
- versionCode flutterVersionCode.toInteger()
- versionName flutterVersionName
- }
-
- 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.debug
- }
- }
-}
-
-flutter {
- source '../..'
-}
-
-dependencies {
- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
- implementation "com.google.android.material:material:1.8.0"
-}
diff --git a/flutter_lyra/example/android/app/build.gradle.kts b/flutter_lyra/example/android/app/build.gradle.kts
new file mode 100644
index 0000000..74d7f29
--- /dev/null
+++ b/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 = "../.."
+}
diff --git a/flutter_lyra/example/android/app/proguard-rules.pro b/flutter_lyra/example/android/app/proguard-rules.pro
new file mode 100644
index 0000000..54b3760
--- /dev/null
+++ b/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
\ No newline at end of file
diff --git a/flutter_lyra/example/android/app/src/debug/AndroidManifest.xml b/flutter_lyra/example/android/app/src/debug/AndroidManifest.xml
index 9390542..60e515f 100644
--- a/flutter_lyra/example/android/app/src/debug/AndroidManifest.xml
+++ b/flutter_lyra/example/android/app/src/debug/AndroidManifest.xml
@@ -1,8 +1,8 @@
+ package="tech.bam.flutter_lyra_example">
-
-
+
+
\ No newline at end of file
diff --git a/flutter_lyra/example/android/app/src/main/AndroidManifest.xml b/flutter_lyra/example/android/app/src/main/AndroidManifest.xml
index 61ff343..4f88a6f 100644
--- a/flutter_lyra/example/android/app/src/main/AndroidManifest.xml
+++ b/flutter_lyra/example/android/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
-
+
@@ -17,12 +17,12 @@
while the Flutter UI initializes. After that, this theme continues
to determine the Window background behind the Flutter UI. -->
+ android:name="io.flutter.embedding.android.NormalTheme"
+ android:resource="@style/NormalTheme"
+ />
-
-
+
+
-
-
+
+
\ No newline at end of file
diff --git a/flutter_lyra/example/android/build.gradle b/flutter_lyra/example/android/build.gradle
deleted file mode 100644
index 9d27344..0000000
--- a/flutter_lyra/example/android/build.gradle
+++ /dev/null
@@ -1,29 +0,0 @@
-buildscript {
- ext.kotlin_version = '1.6.10'
- repositories {
- google()
- mavenCentral()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:7.4.2'
- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
- }
-}
-
-allprojects {
- repositories {
- google()
- mavenCentral()
- }
-}
-
-rootProject.buildDir = '../build'
-subprojects {
- project.buildDir = "${rootProject.buildDir}/${project.name}"
- project.evaluationDependsOn(':app')
-}
-
-tasks.register("clean", Delete) {
- delete rootProject.buildDir
-}
diff --git a/flutter_lyra/example/android/build.gradle.kts b/flutter_lyra/example/android/build.gradle.kts
new file mode 100644
index 0000000..dbee657
--- /dev/null
+++ b/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("clean") {
+ delete(rootProject.layout.buildDirectory)
+}
diff --git a/flutter_lyra/example/android/gradle/wrapper/gradle-wrapper.properties b/flutter_lyra/example/android/gradle/wrapper/gradle-wrapper.properties
index 3c472b9..7722712 100644
--- a/flutter_lyra/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/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
\ No newline at end of file
diff --git a/flutter_lyra/example/android/settings.gradle b/flutter_lyra/example/android/settings.gradle
deleted file mode 100644
index 44e62bc..0000000
--- a/flutter_lyra/example/android/settings.gradle
+++ /dev/null
@@ -1,11 +0,0 @@
-include ':app'
-
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
-
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
-
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
diff --git a/flutter_lyra/example/android/settings.gradle.kts b/flutter_lyra/example/android/settings.gradle.kts
new file mode 100644
index 0000000..fb605bc
--- /dev/null
+++ b/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")
diff --git a/flutter_lyra/example/ios/Runner.xcodeproj/project.pbxproj b/flutter_lyra/example/ios/Runner.xcodeproj/project.pbxproj
index 6c039d4..1c82214 100644
--- a/flutter_lyra/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/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;
diff --git a/flutter_lyra/pubspec.yaml b/flutter_lyra/pubspec.yaml
index 5bcb148..9d5f2db 100644
--- a/flutter_lyra/pubspec.yaml
+++ b/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:
diff --git a/flutter_lyra_android/CHANGELOG.md b/flutter_lyra_android/CHANGELOG.md
index 8d66abd..065c70f 100644
--- a/flutter_lyra_android/CHANGELOG.md
+++ b/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
diff --git a/flutter_lyra_android/android/build.gradle b/flutter_lyra_android/android/build.gradle
index e194db9..74cfd95 100644
--- a/flutter_lyra_android/android/build.gradle
+++ b/flutter_lyra_android/android/build.gradle
@@ -1,52 +1,52 @@
-group 'tech.bam.flutter_lyra'
-version '1.0-SNAPSHOT'
+group = "tech.bam.flutter_lyra"
+version = "1.0-SNAPSHOT"
buildscript {
- ext.kotlin_version = '1.7.10'
+ ext.kotlin_version = "2.1.0"
repositories {
google()
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:7.4.2'
- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+ classpath("com.android.tools.build:gradle:8.9.1")
+ classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
}
}
-rootProject.allprojects {
+allprojects {
repositories {
google()
mavenCentral()
}
}
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
+apply plugin: "com.android.library"
+apply plugin: "kotlin-android"
android {
- compileSdkVersion 33
+ namespace = "tech.bam.flutter_lyra"
+
+ compileSdk = 36
compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
+ sourceCompatibility = JavaVersion.VERSION_17
+ targetCompatibility = JavaVersion.VERSION_17
}
kotlinOptions {
- jvmTarget = '1.8'
+ jvmTarget = JavaVersion.VERSION_17
}
sourceSets {
- main.java.srcDirs += 'src/main/kotlin'
+ main.java.srcDirs += "src/main/kotlin"
}
defaultConfig {
- minSdkVersion 21
+ minSdk = 24
}
-}
-
-dependencies {
- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
- implementation 'com.lyra:sdk:1.10.0'
+ dependencies {
+ implementation 'com.lyra:sdk:1.10.0'
+ }
}
\ No newline at end of file
diff --git a/flutter_lyra_android/pubspec.yaml b/flutter_lyra_android/pubspec.yaml
index 986b702..be2768b 100644
--- a/flutter_lyra_android/pubspec.yaml
+++ b/flutter_lyra_android/pubspec.yaml
@@ -1,7 +1,7 @@
name: flutter_lyra_android
description: Android implementation of the flutter_lyra plugin
-version: 0.5.1
+version: 0.6.0
homepage: https://github.com/bamlab/Flutter-Lyra
repository: https://github.com/bamlab/Flutter-Lyra
@@ -22,7 +22,7 @@ flutter:
dependencies:
flutter:
sdk: flutter
- flutter_lyra_platform_interface: ^0.5.1
+ flutter_lyra_platform_interface: ^0.6.0
dev_dependencies:
analyzer: ^5.13.0
flutter_test:
diff --git a/flutter_lyra_ios/CHANGELOG.md b/flutter_lyra_ios/CHANGELOG.md
index 28430eb..7c18962 100644
--- a/flutter_lyra_ios/CHANGELOG.md
+++ b/flutter_lyra_ios/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
diff --git a/flutter_lyra_ios/pubspec.yaml b/flutter_lyra_ios/pubspec.yaml
index 9fe839a..20814af 100644
--- a/flutter_lyra_ios/pubspec.yaml
+++ b/flutter_lyra_ios/pubspec.yaml
@@ -1,6 +1,6 @@
name: flutter_lyra_ios
description: iOS implementation of the flutter_lyra plugin
-version: 0.5.1
+version: 0.6.0
homepage: https://github.com/bamlab/Flutter-Lyra
repository: https://github.com/bamlab/Flutter-Lyra
@@ -19,7 +19,7 @@ flutter:
dependencies:
flutter:
sdk: flutter
- flutter_lyra_platform_interface: ^0.5.1
+ flutter_lyra_platform_interface: ^0.6.0
dev_dependencies:
analyzer: ^4.7.0
flutter_test:
diff --git a/flutter_lyra_platform_interface/CHANGELOG.md b/flutter_lyra_platform_interface/CHANGELOG.md
index 599511a..a1e29d8 100644
--- a/flutter_lyra_platform_interface/CHANGELOG.md
+++ b/flutter_lyra_platform_interface/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
diff --git a/flutter_lyra_platform_interface/pubspec.yaml b/flutter_lyra_platform_interface/pubspec.yaml
index 4d27871..8009eff 100644
--- a/flutter_lyra_platform_interface/pubspec.yaml
+++ b/flutter_lyra_platform_interface/pubspec.yaml
@@ -1,6 +1,6 @@
name: flutter_lyra_platform_interface
description: A common platform interface for the flutter_lyra plugin.
-version: 0.5.1
+version: 0.6.0
homepage: https://github.com/bamlab/Flutter-Lyra
repository: https://github.com/bamlab/Flutter-Lyra