diff --git a/android/build.gradle b/android/build.gradle index 645f7b9..ea54ef8 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,19 +1,6 @@ group 'uk.orth.push' version '1.0-SNAPSHOT' -buildscript { - ext.kotlin_version = '2.1.0' - repositories { - google() - mavenCentral() - } - - dependencies { - classpath 'com.android.tools.build:gradle:8.7.3' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - rootProject.allprojects { repositories { google() @@ -22,7 +9,6 @@ rootProject.allprojects { } apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' android { namespace = "uk.orth.push" @@ -36,10 +22,6 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = '1.8' - } - sourceSets { main.java.srcDirs += 'src/main/kotlin' } @@ -49,8 +31,13 @@ android { } } +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 + } +} + dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "com.google.firebase:firebase-messaging:24.1.0" // Add localbroadcastmanager because firebase-messaging 24+ doesn't include it. // Warning: localbroadcastmanager is deprecated. We still use it because overriding FirebaseMessagingService diff --git a/pubspec.yaml b/pubspec.yaml index e9cab12..99e3d2e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -6,8 +6,10 @@ issue_tracker: https://github.com/ben-xD/push/issues homepage: https://tlduck.com/ environment: - sdk: ">=2.12.0 <4.0.0" - flutter: ">=1.20.0" + # Built-in Kotlin support for plugins landed in Flutter 3.44.0. See + # https://docs.flutter.dev/release/breaking-changes/migrate-to-built-in-kotlin/for-plugin-authors + sdk: ">=3.12.0 <4.0.0" + flutter: ">=3.44.0" dependencies: flutter: