From 77f8a04a8e4a49e4ca563879a5a0bfa0c8f01bd9 Mon Sep 17 00:00:00 2001 From: JunsuChoi Date: Wed, 23 Oct 2024 14:48:05 +0900 Subject: [PATCH 1/4] [tools] Bump up sdk version SDK version must be upgraded to 3.0 or higher. https://groups.google.com/g/flutter-announce/c/JQHzM3FbBGI/m/B-i8IVa1AQAJ --- tools/pubspec.yaml | 2 +- tools/test_data/foo/example/pubspec.yaml | 5 ++--- tools/test_data/foo/pubspec.yaml | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/pubspec.yaml b/tools/pubspec.yaml index 79f20c90b..2656cc54a 100644 --- a/tools/pubspec.yaml +++ b/tools/pubspec.yaml @@ -4,7 +4,7 @@ repository: https://github.com/flutter-tizen/plugins/tree/master/tools publish_to: "none" environment: - sdk: ">=2.18.0 <4.0.0" + sdk: ">=3.1.0 <4.0.0" dependencies: args: ^2.1.0 diff --git a/tools/test_data/foo/example/pubspec.yaml b/tools/test_data/foo/example/pubspec.yaml index 8a66f3e65..3942a0f16 100644 --- a/tools/test_data/foo/example/pubspec.yaml +++ b/tools/test_data/foo/example/pubspec.yaml @@ -3,8 +3,8 @@ description: Demonstrates how to use the foo plugin. publish_to: "none" environment: - sdk: ">=2.12.0 <3.0.0" - flutter: ">=2.0.0" + sdk: ">=3.1.0 <4.0.0" + flutter: ">=3.13.0" dependencies: flutter: @@ -18,4 +18,3 @@ dev_dependencies: integration_test: sdk: flutter integration_test_tizen: ^2.0.1 - diff --git a/tools/test_data/foo/pubspec.yaml b/tools/test_data/foo/pubspec.yaml index 2ec3cffa9..72d56f668 100644 --- a/tools/test_data/foo/pubspec.yaml +++ b/tools/test_data/foo/pubspec.yaml @@ -3,8 +3,8 @@ description: A new flutter plugin project. publish_to: "none" environment: - sdk: ">=2.12.0 <3.0.0" - flutter: ">=2.0.0" + sdk: ">=3.1.0 <4.0.0" + flutter: ">=3.13.0" dependencies: flutter: From 22e10e87ceaa4fe9f74ec84b9235ca1d99c7f63b Mon Sep 17 00:00:00 2001 From: JunsuChoi Date: Wed, 23 Oct 2024 17:47:00 +0900 Subject: [PATCH 2/4] [tool] Temporarily skip wearable_rotary from build-examples --- tools/lib/src/build_examples_command.dart | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/lib/src/build_examples_command.dart b/tools/lib/src/build_examples_command.dart index a9fa71def..47eccbf19 100644 --- a/tools/lib/src/build_examples_command.dart +++ b/tools/lib/src/build_examples_command.dart @@ -23,6 +23,16 @@ class BuildExamplesCommand extends PackageLoopingCommand { bool builtSomething = false; for (final RepositoryPackage example in package.getExamples()) { + final String packageName = getRelativePosixPath( + example.directory, + from: packagesDir, + ); + // TODO(jsuya): Temporarily skip build test of wearable_rotary. + if (packageName == 'wearable_rotary/example') { + builtSomething = true; + print('Skip build test of wearable_rotary/example.'); + continue; + } int exitCode = await processRunner.runAndStream( 'flutter-tizen', ['pub', 'get'], @@ -44,10 +54,6 @@ class BuildExamplesCommand extends PackageLoopingCommand { workingDir: example.directory, ); if (exitCode != 0) { - final String packageName = getRelativePosixPath( - example.directory, - from: packagesDir, - ); errors.add(packageName); } } From 1625cb1a4da2960dbfbcc52dd51affc4a11cefdb Mon Sep 17 00:00:00 2001 From: JunsuChoi Date: Thu, 24 Oct 2024 10:05:50 +0900 Subject: [PATCH 3/4] Revert "[tool] Temporarily skip wearable_rotary from build-examples" This reverts commit 22e10e87ceaa4fe9f74ec84b9235ca1d99c7f63b. --- tools/lib/src/build_examples_command.dart | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/tools/lib/src/build_examples_command.dart b/tools/lib/src/build_examples_command.dart index 47eccbf19..a9fa71def 100644 --- a/tools/lib/src/build_examples_command.dart +++ b/tools/lib/src/build_examples_command.dart @@ -23,16 +23,6 @@ class BuildExamplesCommand extends PackageLoopingCommand { bool builtSomething = false; for (final RepositoryPackage example in package.getExamples()) { - final String packageName = getRelativePosixPath( - example.directory, - from: packagesDir, - ); - // TODO(jsuya): Temporarily skip build test of wearable_rotary. - if (packageName == 'wearable_rotary/example') { - builtSomething = true; - print('Skip build test of wearable_rotary/example.'); - continue; - } int exitCode = await processRunner.runAndStream( 'flutter-tizen', ['pub', 'get'], @@ -54,6 +44,10 @@ class BuildExamplesCommand extends PackageLoopingCommand { workingDir: example.directory, ); if (exitCode != 0) { + final String packageName = getRelativePosixPath( + example.directory, + from: packagesDir, + ); errors.add(packageName); } } From a30d498d8e03bc17f90bf94f5c3aec6af5ea37a2 Mon Sep 17 00:00:00 2001 From: JunsuChoi Date: Thu, 24 Oct 2024 10:06:23 +0900 Subject: [PATCH 4/4] [ci] Skip wearable_rotary in example build --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 22ea2a837..193d3f1e6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -57,5 +57,6 @@ jobs: run: | export PATH=`pwd`/flutter-tizen/bin:$PATH ./tools/tools_runner.sh build-examples \ + --exclude=wearable_rotary \ --run-on-changed-packages \ --base-sha=$(git rev-parse HEAD^)