diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index 7e42539..b2a769b 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -18,7 +18,7 @@ env: BUILD_TYPE: 'SNAPSHOT' # Allowed values: 'SNAPSHOT', 'RELEASE', 'RELEASE_CANDIDATE' FLUTTER_VERSION: '3.19.0' XCODE_VERSION: '15.4' - JAVA_VERSION: '11' + JAVA_VERSION: '17' RUBY_VERSION: '3.1' HOST_NAME: ${{ secrets.HOST_NAME }} PRIVATE_REPOSITORY_API_KEY: ${{ secrets.PRIVATE_REPOSITORY_API_KEY }} diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1f93d8c..5f851c1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -21,7 +21,7 @@ env: BUILD_TYPE: 'RELEASE' # Allowed values: 'SNAPSHOT', 'RELEASE', 'RELEASE_CANDIDATE' FLUTTER_VERSION: '3.19.0' XCODE_VERSION: '15.4' - JAVA_VERSION: '11' + JAVA_VERSION: '17' RUBY_VERSION: '3.1' HOST_NAME: ${{ secrets.HOST_NAME }} PRIVATE_REPOSITORY_API_KEY: ${{ secrets.PRIVATE_REPOSITORY_API_KEY }} diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 7c52ce6..2c74955 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -18,7 +18,7 @@ env: BUILD_TYPE: 'SNAPSHOT' # Allowed values: 'SNAPSHOT', 'RELEASE', 'RELEASE_CANDIDATE' FLUTTER_VERSION: '3.19.0' XCODE_VERSION: '15.4' - JAVA_VERSION: '11' + JAVA_VERSION: '17' RUBY_VERSION: '3.1' HOST_NAME: ${{ secrets.HOST_NAME }} PRIVATE_REPOSITORY_API_KEY: ${{ secrets.PRIVATE_REPOSITORY_API_KEY }} @@ -107,4 +107,4 @@ jobs: uses: maierj/fastlane-action@v3.0.0 with: lane: 'pr' - subdirectory: 'android' \ No newline at end of file + subdirectory: 'android' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c5edd4a..4dde2c6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,7 +18,7 @@ env: BUILD_TYPE: 'RELEASE_CANDIDATE' # Allowed values: 'SNAPSHOT', 'RELEASE', 'RELEASE_CANDIDATE' FLUTTER_VERSION: '3.19.0' XCODE_VERSION: '15.4' - JAVA_VERSION: '11' + JAVA_VERSION: '17' RUBY_VERSION: '3.1' HOST_NAME: ${{ secrets.HOST_NAME }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -93,4 +93,4 @@ jobs: uses: maierj/fastlane-action@v3.0.0 with: lane: 'pr' - subdirectory: 'android' \ No newline at end of file + subdirectory: 'android' diff --git a/README.md b/README.md index 3f87fc1..afed649 100644 --- a/README.md +++ b/README.md @@ -34,10 +34,11 @@ Your development setup has to meet the following prerequisites: * Xcode 15.x, including Swift 5.7 or later * Android 6 or later, with API level 23 -or- * Android 10 or later, with API level 29, for the biometric authenticator to work -* Gradle 7.4 or later -* Android Gradle Plugin `com.android.tools.build:gradle` 7.0.0 or later -* Kotlin Gradle Plugin `org.jetbrains.kotlin:kotlin-gradle-plugin` 1.8.0 or later +* Gradle 8.4 or later +* Android Gradle Plugin `com.android.tools.build:gradle` 8.3.0 or later +* Kotlin Gradle Plugin `org.jetbrains.kotlin:kotlin-gradle-plugin` 1.8.22 or later * Dart SDK 3.3.0 or later +* Java 17 ### Initialization diff --git a/android/app/build.gradle b/android/app/build.gradle index 2bc628b..dd97ef8 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -30,14 +30,15 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 34 + namespace 'ch.nevis.nevis_mobile_authentication_sdk_example_app_flutter' + compileSdk 34 compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = '11' + jvmTarget = '17' } sourceSets { @@ -47,7 +48,8 @@ android { defaultConfig { applicationId "ch.nevis.nevis_mobile_authentication_sdk_example" minSdkVersion 23 - targetSdkVersion flutter.targetSdkVersion + targetSdkVersion 34 + multiDexEnabled true versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 5d0fe6d..13d5508 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml index bf8845c..399f698 100644 --- a/android/app/src/profile/AndroidManifest.xml +++ b/android/app/src/profile/AndroidManifest.xml @@ -1,5 +1,4 @@ - +