Skip to content

Migrated plugin to Built-in Kotlin Gradle Plugin (KGP) #136

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
drmirk wants to merge 7 commits into
base: main
Choose a base branch
from
+35 −28
Open

Migrated plugin to Built-in Kotlin Gradle Plugin (KGP) #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7fe1862
Migrated plugin to Built-in Kotlin Gradle Plugin (KGP)
drmirk May 30, 2026
8801fad
Fix: Migrated plugin to Built-in Kotlin Version Reverted
drmirk May 30, 2026
3eddfcd
Fix: Supporting Flutter versions earlier than 3.44 after kgp migration
drmirk Jun 8, 2026
bf14c65
Fix: Example runs now
drmirk Jun 9, 2026
4844feb
Reverted pubspec.yaml to original formating
drmirk Jul 6, 2026
42460cb
Merge branch 'main' into kgp_migration
drmirk Jul 6, 2026
a495627
Merge branch 'main' into kgp_migration
drmirk Jul 7, 2026
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
40 changes: 16 additions & 24 deletions wakelock_plus/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,15 @@
group 'dev.fluttercommunity.plus.wakelock'
version '1.0-SNAPSHOT'

buildscript {
ext.kotlin_version = '2.2.0'
repositories {
google()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:8.12.1'
}
plugins {
id 'com.android.library'
}

rootProject.allprojects {
repositories {
google()
mavenCentral()
}
// Conditionally apply KGP only if AGP version is earlier than 9.
def agpMajor = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0] as int
if (agpMajor < 9) {
project.pluginManager.apply('org.jetbrains.kotlin.android')
}

apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
group 'dev.fluttercommunity.plus.wakelock'
version '1.0-SNAPSHOT'

android {
namespace 'dev.fluttercommunity.plus.wakelock'
Expand All @@ -32,9 +20,6 @@ android {
targetCompatibility JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = '17'
}
lintOptions {
disable 'InvalidPackage'
}
Expand All @@ -51,7 +36,6 @@ android {
}

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
testImplementation 'org.jetbrains.kotlin:kotlin-test'
testImplementation 'org.mockito:mockito-core:5.0.0'
}
Expand All @@ -69,3 +53,11 @@ android {
}
}
}


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

18 changes: 14 additions & 4 deletions wakelock_plus/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
plugins {
id 'com.android.application'
id 'kotlin-android'
id 'dev.flutter.flutter-gradle-plugin'
}

// Conditionally apply KGP only if AGP version is earlier than 9.
def agpMajor = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0] as int
if (agpMajor < 9) {
project.pluginManager.apply('org.jetbrains.kotlin.android')
}

def localProperties = new Properties()
def localPropertiesFile = rootProject.file('local.properties')
if (localPropertiesFile.exists()) {
Expand Down Expand Up @@ -31,9 +37,6 @@ android {
targetCompatibility JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = '17'
}

sourceSets {
main.java.srcDirs += 'src/main/kotlin'
Expand All @@ -59,6 +62,13 @@ android {
}
}

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


flutter {
source '../..'
}
Expand Down
5 changes: 5 additions & 0 deletions wakelock_plus/example/android/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
org.gradle.jvmargs=-Xmx4g
android.useAndroidX=true
android.enableJetifier=true

# This builtInKotlin flag was added automatically by Flutter migrator
android.builtInKotlin=false
# This newDsl flag was added automatically by Flutter migrator
android.newDsl=false
Loading