Skip to content
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.

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

Release 3.0.1 using gradle 2024.1.2.beta #20

Merged
merged 2 commits into from
May 13, 2024
Merged
Changes from 1 commit
Commits
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
Next Next commit
Add gradle and flutter wrapper tasks to kradle script.
buijs-dev committed May 13, 2024
commit 3b20bd0985297858e2bf9f09605f338229945f77
39 changes: 37 additions & 2 deletions lib/src/cli/runner.dart
Original file line number Diff line number Diff line change
@@ -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;
2 changes: 1 addition & 1 deletion test/src/cli/runner_test.dart
Original file line number Diff line number Diff line change
@@ -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);
});
13 changes: 12 additions & 1 deletion test/src/systemtest/e2e_test.dart
Original file line number Diff line number Diff line change
@@ -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)