Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 6.1.0
- Updates minimum supported SDK version to Flutter 3.44 / Dart 3.12
- [Android] Migrates to built-in Kotlin (applies the Kotlin Gradle Plugin only on AGP < 9)

## 6.0.4
- [Android] Updated compileSdkVersion to 36, Gradle to 8.14 and Java/Kotlin compatibility to version 17

Expand Down
17 changes: 12 additions & 5 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,12 @@ rootProject.allprojects {
}

apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'

// AGP 9+ has built-in Kotlin support; older versions need the plugin explicitly.
def agpMajor = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0] as int
if (agpMajor < 9) {
apply plugin: 'kotlin-android'
}

android {
// Conditional for compatibility with AGP <4.2.
Expand All @@ -38,10 +43,6 @@ android {
targetCompatibility JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_17.toString()
}

sourceSets {
main.java.srcDirs += 'src/main/kotlin'
}
Expand All @@ -54,6 +55,12 @@ android {
}
}

kotlin {
compilerOptions {
jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
}
}

dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
Expand Down
6 changes: 3 additions & 3 deletions pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
name: flutter_archive
description: Create and extract ZIP archive files in Android, iOS and macOS. Zip all files in a directory recursively or a given list of files.
version: 6.0.4
version: 6.1.0
homepage: https://github.com/kineapps/flutter_archive
repository: https://github.com/kineapps/flutter_archive

environment:
sdk: '>=2.15.0 <4.0.0'
flutter: ">=2.8.0"
sdk: ^3.12.0
flutter: ">=3.44.0"

dependencies:
flutter:
Expand Down
Loading