From d55440838045406f2653058ea4694beece05bad3 Mon Sep 17 00:00:00 2001 From: Gillian <72627535+buijs-dev@users.noreply.github.com> Date: Fri, 24 May 2024 19:33:11 +0200 Subject: [PATCH] Develop (#21) * Add gradle and flutter wrapper tasks to kradle script. * Bump gradle version to 2024.1.2.beta * Bump gradle version to 2024.1.3.beta and release 3.0.2 --- CHANGELOG.md | 3 +++ lib/src/common/config.dart | 4 ++-- pubspec.yaml | 2 +- resources/kradle.yaml | 2 +- test/src/cli/task_service_test.dart | 8 ++++---- test/src/producer/android_test.dart | 4 ++-- 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 309b9d5..b3ebd7e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 3.0.2 +* Use Klutter Gradle v2024.1.3.beta. + ## 3.0.1 * Use Klutter Gradle v2024.1.2.beta. diff --git a/lib/src/common/config.dart b/lib/src/common/config.dart index e31f2b9..8581390 100644 --- a/lib/src/common/config.dart +++ b/lib/src/common/config.dart @@ -3,7 +3,7 @@ import "package:meta/meta.dart"; import "../../klutter.dart"; /// The version of the Klutter Pub Plugin. -const klutterPubVersion = "3.0.1"; +const klutterPubVersion = "3.0.2"; /// The version of the Klutter UI Pub Plugin. const klutterUIPubVersion = "1.1.0"; @@ -12,7 +12,7 @@ const klutterUIPubVersion = "1.1.0"; const squintPubVersion = "0.1.2"; /// The version of the Klutter Gradle Plugin. -const klutterGradleVersion = "2024.1.2.beta"; +const klutterGradleVersion = "2024.1.3.beta"; /// The default Flutter version to be used in the Klutter project. const klutterFlutterVersion = "3.10.6"; diff --git a/pubspec.yaml b/pubspec.yaml index a7406e4..6422fe6 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: klutter description: Write Flutter plugins for both Android and iOS using Kotlin only. -version: 3.0.1 +version: 3.0.2 homepage: https://buijs.dev repository: https://github.com/buijs-dev/klutter-dart diff --git a/resources/kradle.yaml b/resources/kradle.yaml index fa3a48d..2018d2e 100644 --- a/resources/kradle.yaml +++ b/resources/kradle.yaml @@ -1,3 +1,3 @@ -bom-version: '2024.1.2.beta' +bom-version: '2024.1.3.beta' flutter-version: '3.10.6' feature-protobuf-enabled: false \ No newline at end of file diff --git a/test/src/cli/task_service_test.dart b/test/src/cli/task_service_test.dart index e820b67..3a179be 100644 --- a/test/src/cli/task_service_test.dart +++ b/test/src/cli/task_service_test.dart @@ -44,7 +44,7 @@ void main() { expect( tasks.getTask(TaskName.init).toString(), - "init\n bom (Optional) klutter gradle version. Defaults to '2024.1.2.beta'.\n flutter (Optional) flutter sdk version in format major.minor.patch. Defaults to '3.10.6'.\n root (Optional) klutter project root directory. Defaults to 'current working directory'.\n ios (Optional) ios version. Defaults to '13.0'.\n", + "init\n bom (Optional) klutter gradle version. Defaults to '$klutterGradleVersion'.\n flutter (Optional) flutter sdk version in format major.minor.patch. Defaults to '3.10.6'.\n root (Optional) klutter project root directory. Defaults to 'current working directory'.\n ios (Optional) ios version. Defaults to '13.0'.\n", ); }); @@ -75,7 +75,7 @@ void main() { " root (Optional) klutter project root directory. Defaults to 'current working directory'.\n" "\n" "init\n" - " bom (Optional) klutter gradle version. Defaults to '2024.1.2.beta'.\n" + " bom (Optional) klutter gradle version. Defaults to '$klutterGradleVersion'.\n" " flutter (Optional) flutter sdk version in format major.minor.patch. Defaults to '3.10.6'.\n" " root (Optional) klutter project root directory. Defaults to 'current working directory'.\n" " ios (Optional) ios version. Defaults to '13.0'.\n" @@ -91,9 +91,9 @@ void main() { " group (Optional) plugin group name. Defaults to 'dev.buijs.klutter.example'.\n" " flutter (Optional) flutter sdk version in format major.minor.patch. Defaults to '3.10.6'.\n" " root (Optional) klutter project root directory. Defaults to 'current working directory'.\n" - " klutter (Optional) klutter pub version. Defaults to '3.0.1'.\n" + " klutter (Optional) klutter pub version. Defaults to '$klutterPubVersion'.\n" " klutterui (Optional) klutter_ui pub version. Defaults to '1.1.0'.\n" - " bom (Optional) klutter gradle version. Defaults to '2024.1.2.beta'.\n" + " bom (Optional) klutter gradle version. Defaults to '$klutterGradleVersion'.\n" " squint (Optional) squint_json pub version. Defaults to '0.1.2'.\n" "\n" "build\n" diff --git a/test/src/producer/android_test.dart b/test/src/producer/android_test.dart index 041baee..b23a2b4 100644 --- a/test/src/producer/android_test.dart +++ b/test/src/producer/android_test.dart @@ -86,7 +86,7 @@ void main() { pluginVersion: pluginVersion, packageName: packageName, pathToAndroid: android.path, - klutterBomVersion: "2024.1.2.beta", + klutterBomVersion: klutterGradleVersion, ); expect( @@ -109,7 +109,7 @@ void main() { } dependencies { - classpath platform("dev.buijs.klutter:bom:2024.1.2.beta") + classpath platform("dev.buijs.klutter:bom:$klutterGradleVersion") classpath "dev.buijs.klutter:gradle" classpath 'com.android.tools.build:gradle:8.0.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10"