Release 3.0.1 using gradle 2024.1.2.beta

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.

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:  

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<String> run(List<String> args, [TaskService? taskServiceOrNull]) async {
+Future<String> run(
+  List<String> 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;

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";

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
 

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

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);
   });

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"

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"

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 <command> [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)