Skip to content

feat(android): migrate to built-in Kotlin #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kristjan wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(android): migrate to built-in Kotlin #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 6 additions & 19 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()
Expand All @@ -22,7 +9,6 @@ rootProject.allprojects {
}

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

android {
namespace = "uk.orth.push"
Expand All @@ -36,10 +22,6 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = '1.8'
}

sourceSets {
main.java.srcDirs += 'src/main/kotlin'
}
Expand All @@ -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
Expand Down
6 changes: 4 additions & 2 deletions pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down