From 3b20bd0985297858e2bf9f09605f338229945f77 Mon Sep 17 00:00:00 2001 From: Gillian <72627535+buijs-dev@users.noreply.github.com> Date: Mon, 13 May 2024 19:46:37 +0200 Subject: [PATCH 1/2] Add gradle and flutter wrapper tasks to kradle script. --- lib/src/cli/runner.dart | 39 +++++++++++++++++++++++++++++-- test/src/cli/runner_test.dart | 2 +- test/src/systemtest/e2e_test.dart | 13 ++++++++++- 3 files changed, 50 insertions(+), 4 deletions(-) diff --git a/lib/src/cli/runner.dart b/lib/src/cli/runner.dart index 4f9dab8..825b78c 100644 --- a/lib/src/cli/runner.dart +++ b/lib/src/cli/runner.dart @@ -22,15 +22,50 @@ import "dart:io"; +import "../common/common.dart"; import "cli.dart"; import "context.dart"; /// Run the user command. -Future run(List args, [TaskService? taskServiceOrNull]) async { +Future run( + List args, { + Directory? workingDirectoryOrNull, + TaskService? taskServiceOrNull, + Executor? executor, + GetFlutterSDK? getFlutterSDK, +}) async { final arguments = [...args]; final firstArgument = arguments.removeAt(0); final taskName = firstArgument.toTaskNameOrNull; - final context = toContextOrNull(Directory.current, arguments); + final workingDirectory = workingDirectoryOrNull ?? Directory.current; + if (taskName == TaskName.gradle) { + print("executing gradle task..."); + final gradlew = + workingDirectory.resolveFile("gradlew").verifyFileExists.absolutePath; + (executor ?? Executor()) + ..workingDirectory = workingDirectory + ..arguments = arguments + ..executable = gradlew + ..run(); + return "finished executing gradle task"; + } + + if (taskName == TaskName.flutter) { + print("executing flutter task..."); + final flutterTask = getFlutterSDK ?? GetFlutterSDK(); + final flutterResult = + await flutterTask.executeOrThrow(Context(workingDirectory, {})); + final flutter = + flutterResult.resolveFile("flutter/bin/flutter".normalize).absolutePath; + (executor ?? Executor()) + ..workingDirectory = workingDirectory + ..arguments = arguments + ..executable = flutter + ..run(); + return "finished executing flutter task"; + } + + final context = toContextOrNull(workingDirectory, arguments); final taskService = taskServiceOrNull ?? TaskService(); if (firstArgument.toLowerCase() == "help") { return taskService.displayKradlewHelpText; diff --git a/test/src/cli/runner_test.dart b/test/src/cli/runner_test.dart index 0f11b3e..0202969 100644 --- a/test/src/cli/runner_test.dart +++ b/test/src/cli/runner_test.dart @@ -34,7 +34,7 @@ void main() { }); test("Verify invalid arguments are handled", () async { - final output = await run(["gradle", "blabla"]); + final output = await run(["create", "blabla"]); expect(output.contains("received invalid task options: [blabla]"), true, reason: output); }); diff --git a/test/src/systemtest/e2e_test.dart b/test/src/systemtest/e2e_test.dart index ac8e7b8..d107f87 100644 --- a/test/src/systemtest/e2e_test.dart +++ b/test/src/systemtest/e2e_test.dart @@ -48,7 +48,7 @@ void main() { final help = await run([ "create", "root=${Directory.systemTemp.absolutePath}", - ], FakeTaskService()); + ], taskServiceOrNull: FakeTaskService()); expect(help.contains("Usage: kradlew [option=value]"), true); /// Run a Klutter task without an existing Flutter project @@ -82,6 +82,11 @@ void main() { expect(cachedSdk.isEmpty, false, reason: "the cached sdk should not be empty"); + /// Run flutter doctor to check flutter task + final flutterDoctor = await run(["flutter", "doctor"]); + expect(flutterDoctor.contains("finished executing flutter task"), true, + reason: flutterDoctor); + /// Create Flutter plugin project. final createResult = await createKlutterPlugin( organisation: organisation, @@ -176,6 +181,12 @@ void main() { true, reason: "android/klutter/build.gradle.kts should exist"); + /// Run gradlew tasks to check gradlew works + final gradlewTasks = await run(["gradle", "--help"], + workingDirectoryOrNull: producerPlugin); + expect(gradlewTasks.contains("finished executing gradle task"), true, + reason: gradlewTasks); + /// IOS/Klutter folder should be created. expect( Directory("${producerPlugin.absolutePath}/ios/Klutter".normalize) From d1b8986183a9f1467b9f04e9d7f2ee8b6c288448 Mon Sep 17 00:00:00 2001 From: Gillian <72627535+buijs-dev@users.noreply.github.com> Date: Mon, 13 May 2024 20:34:35 +0200 Subject: [PATCH 2/2] Bump gradle version to 2024.1.2.beta --- CHANGELOG.md | 3 +++ README.md | 2 +- 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 ++-- 7 files changed, 14 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 602c021..309b9d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 3.0.1 +* Use Klutter Gradle v2024.1.2.beta. + ## 3.0.0 * Use klutter_ui 1.1.0. * Use Klutter Gradle v2024.1.1.beta with support for protobuf. diff --git a/README.md b/README.md index 4f5dbd5..5a447dc 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ Add the Klutter library to dependencies in the pubspec.yaml: ```yaml dev_dependencies: - klutter: ^3.0.0 + klutter: ^3.0.1 ``` Then run: diff --git a/lib/src/common/config.dart b/lib/src/common/config.dart index 74ef0b7..e31f2b9 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.0"; +const klutterPubVersion = "3.0.1"; /// 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.1.beta"; +const klutterGradleVersion = "2024.1.2.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 1f01ae3..a7406e4 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.0 +version: 3.0.1 homepage: https://buijs.dev repository: https://github.com/buijs-dev/klutter-dart diff --git a/resources/kradle.yaml b/resources/kradle.yaml index 564152b..fa3a48d 100644 --- a/resources/kradle.yaml +++ b/resources/kradle.yaml @@ -1,3 +1,3 @@ -bom-version: '2024.1.1.beta' +bom-version: '2024.1.2.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 669bc79..e820b67 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.1.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 '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", ); }); @@ -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.1.beta'.\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" @@ -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.0'.\n" + " klutter (Optional) klutter pub version. Defaults to '3.0.1'.\n" " klutterui (Optional) klutter_ui pub version. Defaults to '1.1.0'.\n" - " bom (Optional) klutter gradle version. Defaults to '2024.1.1.beta'.\n" + " bom (Optional) klutter gradle version. Defaults to '2024.1.2.beta'.\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 0eeee28..041baee 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.1.beta", + klutterBomVersion: "2024.1.2.beta", ); expect( @@ -109,7 +109,7 @@ void main() { } dependencies { - classpath platform("dev.buijs.klutter:bom:2024.1.1.beta") + classpath platform("dev.buijs.klutter:bom:2024.1.2.beta") classpath "dev.buijs.klutter:gradle" classpath 'com.android.tools.build:gradle:8.0.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10"