Skip to content

Commit 5fc5a82

Browse files
kjeremykjeremy
authored
Migrate to built in kotlin for flutter 3.44 (#49)
see: https://docs.flutter.dev/release/breaking-changes/migrate-to-built-in-kotlin
1 parent 0ed2d52 commit 5fc5a82

8 files changed

Lines changed: 51 additions & 44 deletions

File tree

‎system_theme/android/build.gradle‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,33 @@ group 'com.bruno.system_theme'
22
version '1.0-SNAPSHOT'
33

44
buildscript {
5-
ext.kotlin_version = '1.7.0'
65
repositories {
76
google()
8-
jcenter()
7+
mavenCentral()
98
}
109

1110
dependencies {
1211
classpath 'com.android.tools.build:gradle:4.1.0'
13-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1412
}
1513
}
1614

1715
rootProject.allprojects {
1816
repositories {
1917
google()
20-
jcenter()
18+
mavenCentral()
2119
}
2220
}
2321

2422
apply plugin: 'com.android.library'
25-
apply plugin: 'kotlin-android'
2623

2724
android {
2825
namespace 'com.bruno.system_theme'
29-
compileSdkVersion 31
26+
compileSdkVersion 34
3027

3128
compileOptions {
3229
sourceCompatibility = JavaVersion.VERSION_1_8
3330
targetCompatibility = JavaVersion.VERSION_1_8
3431
}
35-
kotlinOptions {
36-
jvmTarget = JavaVersion.VERSION_1_8
37-
}
3832
sourceSets {
3933
main.java.srcDirs += 'src/main/kotlin'
4034
}
@@ -43,6 +37,8 @@ android {
4337
}
4438
}
4539

46-
dependencies {
47-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
40+
kotlin {
41+
compilerOptions {
42+
jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8
43+
}
4844
}

‎system_theme/example/android/app/build.gradle.kts‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
plugins {
22
id("com.android.application")
3-
id("kotlin-android")
43
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
54
id("dev.flutter.flutter-gradle-plugin")
65
}
@@ -15,10 +14,6 @@ android {
1514
targetCompatibility = JavaVersion.VERSION_17
1615
}
1716

18-
kotlinOptions {
19-
jvmTarget = JavaVersion.VERSION_17.toString()
20-
}
21-
2217
defaultConfig {
2318
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
2419
applicationId = "com.bruno.system_theme_example"
@@ -39,6 +34,12 @@ android {
3934
}
4035
}
4136

37+
kotlin {
38+
compilerOptions {
39+
jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
40+
}
41+
}
42+
4243
flutter {
4344
source = "../.."
4445
}

‎system_theme/example/android/gradle.properties‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
22
android.useAndroidX=true
3+
# This builtInKotlin flag was added automatically by Flutter migrator
4+
android.builtInKotlin=false
5+
# This newDsl flag was added automatically by Flutter migrator
6+
android.newDsl=false

‎system_theme/example/pubspec.lock‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ packages:
2121
dependency: transitive
2222
description:
2323
name: characters
24-
sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
24+
sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b
2525
url: "https://pub.dev"
2626
source: hosted
27-
version: "1.4.0"
27+
version: "1.4.1"
2828
clock:
2929
dependency: transitive
3030
description:
@@ -108,26 +108,26 @@ packages:
108108
dependency: transitive
109109
description:
110110
name: matcher
111-
sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
111+
sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861
112112
url: "https://pub.dev"
113113
source: hosted
114-
version: "0.12.17"
114+
version: "0.12.19"
115115
material_color_utilities:
116116
dependency: transitive
117117
description:
118118
name: material_color_utilities
119-
sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
119+
sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b"
120120
url: "https://pub.dev"
121121
source: hosted
122-
version: "0.11.1"
122+
version: "0.13.0"
123123
meta:
124124
dependency: transitive
125125
description:
126126
name: meta
127-
sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
127+
sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349"
128128
url: "https://pub.dev"
129129
source: hosted
130-
version: "1.17.0"
130+
version: "1.18.0"
131131
path:
132132
dependency: transitive
133133
description:
@@ -200,10 +200,10 @@ packages:
200200
dependency: transitive
201201
description:
202202
name: test_api
203-
sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55
203+
sha256: "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e"
204204
url: "https://pub.dev"
205205
source: hosted
206-
version: "0.7.7"
206+
version: "0.7.11"
207207
vector_math:
208208
dependency: transitive
209209
description:
@@ -229,5 +229,5 @@ packages:
229229
source: hosted
230230
version: "1.0.0"
231231
sdks:
232-
dart: ">=3.8.0-0 <4.0.0"
233-
flutter: ">=3.18.0-18.0.pre.54"
232+
dart: ">=3.12.0 <4.0.0"
233+
flutter: ">=3.44.0"

‎system_theme/example/pubspec.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ description: Demonstrates how to use the system_theme plugin.
66
publish_to: 'none' # Remove this line if you wish to publish to pub.dev
77

88
environment:
9-
sdk: '>=2.12.0 <3.0.0'
9+
sdk: ^3.12.0
10+
flutter: ">=3.44.0"
1011

1112
dependencies:
1213
flutter:

‎system_theme/example/windows/flutter/CMakeLists.txt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ include(${EPHEMERAL_DIR}/generated_config.cmake)
99
# https://github.com/flutter/flutter/issues/57146.
1010
set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper")
1111

12+
# Set fallback configurations for older versions of the flutter tool.
13+
if (NOT DEFINED FLUTTER_TARGET_PLATFORM)
14+
set(FLUTTER_TARGET_PLATFORM "windows-x64")
15+
endif()
16+
1217
# === Flutter Library ===
1318
set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll")
1419

@@ -91,7 +96,7 @@ add_custom_command(
9196
COMMAND ${CMAKE_COMMAND} -E env
9297
${FLUTTER_TOOL_ENVIRONMENT}
9398
"${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat"
94-
windows-x64 $<CONFIG>
99+
${FLUTTER_TARGET_PLATFORM} $<CONFIG>
95100
VERBATIM
96101
)
97102
add_custom_target(flutter_assemble DEPENDS

‎system_theme/pubspec.lock‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ packages:
2121
dependency: transitive
2222
description:
2323
name: characters
24-
sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
24+
sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b
2525
url: "https://pub.dev"
2626
source: hosted
27-
version: "1.4.0"
27+
version: "1.4.1"
2828
clock:
2929
dependency: transitive
3030
description:
@@ -108,26 +108,26 @@ packages:
108108
dependency: transitive
109109
description:
110110
name: matcher
111-
sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
111+
sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861
112112
url: "https://pub.dev"
113113
source: hosted
114-
version: "0.12.17"
114+
version: "0.12.19"
115115
material_color_utilities:
116116
dependency: transitive
117117
description:
118118
name: material_color_utilities
119-
sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
119+
sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b"
120120
url: "https://pub.dev"
121121
source: hosted
122-
version: "0.11.1"
122+
version: "0.13.0"
123123
meta:
124124
dependency: transitive
125125
description:
126126
name: meta
127-
sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
127+
sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349"
128128
url: "https://pub.dev"
129129
source: hosted
130-
version: "1.17.0"
130+
version: "1.18.0"
131131
path:
132132
dependency: transitive
133133
description:
@@ -193,10 +193,10 @@ packages:
193193
dependency: transitive
194194
description:
195195
name: test_api
196-
sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55
196+
sha256: "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e"
197197
url: "https://pub.dev"
198198
source: hosted
199-
version: "0.7.7"
199+
version: "0.7.11"
200200
vector_math:
201201
dependency: transitive
202202
description:
@@ -222,5 +222,5 @@ packages:
222222
source: hosted
223223
version: "1.0.0"
224224
sdks:
225-
dart: ">=3.8.0-0 <4.0.0"
226-
flutter: ">=3.18.0-18.0.pre.54"
225+
dart: ">=3.12.0 <4.0.0"
226+
flutter: ">=3.44.0"

‎system_theme/pubspec.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ repository: https://github.com/bdlukaa/system_theme
55
homepage: https://github.com/bdlukaa/system_theme/tree/master/system_theme
66

77
environment:
8-
sdk: '>=3.0.0 <4.0.0'
9-
flutter: ">=1.20.0"
8+
sdk: ^3.12.0
9+
flutter: ">=3.44.0"
1010

1111
dependencies:
1212
system_theme_web: ^0.0.4

0 commit comments

Comments
 (0)