From 42095fd45b592d8fcce1f4f6c79bf826e6831082 Mon Sep 17 00:00:00 2001 From: Robert Wilson Date: Sat, 22 Mar 2025 08:48:40 -0700 Subject: [PATCH 01/14] update packages --- Flutter_Demo/pubspec.lock | 76 +++++++++++++++++++-------------------- Flutter_Demo/pubspec.yaml | 2 +- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/Flutter_Demo/pubspec.lock b/Flutter_Demo/pubspec.lock index 31f22fb..97e74ec 100644 --- a/Flutter_Demo/pubspec.lock +++ b/Flutter_Demo/pubspec.lock @@ -5,42 +5,42 @@ packages: dependency: transitive description: name: async - sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63 url: "https://pub.dev" source: hosted - version: "2.11.0" + version: "2.12.0" boolean_selector: dependency: transitive description: name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" characters: dependency: transitive description: name: characters - sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.0" clock: dependency: transitive description: name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" collection: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.1" cupertino_icons: dependency: "direct main" description: @@ -53,10 +53,10 @@ packages: dependency: transitive description: name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc" url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.2" flutter: dependency: "direct main" description: flutter @@ -71,18 +71,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" + sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec url: "https://pub.dev" source: hosted - version: "10.0.5" + version: "10.0.8" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" + sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.9" leak_tracker_testing: dependency: transitive description: @@ -95,10 +95,10 @@ packages: dependency: transitive description: name: matcher - sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 url: "https://pub.dev" source: hosted - version: "0.12.16+1" + version: "0.12.17" material_color_utilities: dependency: transitive description: @@ -111,71 +111,71 @@ packages: dependency: transitive description: name: meta - sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.16.0" path: dependency: transitive description: name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.9.1" sky_engine: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" source_span: dependency: transitive description: name: source_span - sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.10.1" stack_trace: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.12.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" string_scanner: dependency: transitive description: name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.4.1" term_glyph: dependency: transitive description: name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" test_api: dependency: "direct main" description: name: test_api - sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" + sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd url: "https://pub.dev" source: hosted - version: "0.7.2" + version: "0.7.4" vector_math: dependency: transitive description: @@ -188,10 +188,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" + sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14" url: "https://pub.dev" source: hosted - version: "14.2.5" + version: "14.3.1" sdks: - dart: ">=3.3.0 <4.0.0" + dart: ">=3.7.0-0 <4.0.0" flutter: ">=3.18.0-18.0.pre.54" diff --git a/Flutter_Demo/pubspec.yaml b/Flutter_Demo/pubspec.yaml index ccd90dd..f0f3893 100644 --- a/Flutter_Demo/pubspec.yaml +++ b/Flutter_Demo/pubspec.yaml @@ -28,7 +28,7 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.2 - test_api: 0.7.2 + test_api: 0.7.4 dev_dependencies: flutter_test: From 96261ad2e0f225f544530750429dd27abd14879d Mon Sep 17 00:00:00 2001 From: Robert Wilson Date: Sat, 22 Mar 2025 09:00:31 -0700 Subject: [PATCH 02/14] Add linter --- Flutter_Demo/pubspec.lock | 8 ++++++++ Flutter_Demo/pubspec.yaml | 1 + 2 files changed, 9 insertions(+) diff --git a/Flutter_Demo/pubspec.lock b/Flutter_Demo/pubspec.lock index 97e74ec..cc3c5ed 100644 --- a/Flutter_Demo/pubspec.lock +++ b/Flutter_Demo/pubspec.lock @@ -91,6 +91,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.1" + lints: + dependency: "direct main" + description: + name: lints + sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7 + url: "https://pub.dev" + source: hosted + version: "5.1.1" matcher: dependency: transitive description: diff --git a/Flutter_Demo/pubspec.yaml b/Flutter_Demo/pubspec.yaml index f0f3893..7ba2856 100644 --- a/Flutter_Demo/pubspec.yaml +++ b/Flutter_Demo/pubspec.yaml @@ -29,6 +29,7 @@ dependencies: # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.2 test_api: 0.7.4 + lints: ^5.1.1 dev_dependencies: flutter_test: From 9c62ba3eb9d3d77e687231459fbdd820bacae0f1 Mon Sep 17 00:00:00 2001 From: Robert Wilson Date: Sat, 22 Mar 2025 09:03:36 -0700 Subject: [PATCH 03/14] update analysis --- Flutter_Demo/analysis_options.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Flutter_Demo/analysis_options.yaml b/Flutter_Demo/analysis_options.yaml index d3ee447..572dd23 100644 --- a/Flutter_Demo/analysis_options.yaml +++ b/Flutter_Demo/analysis_options.yaml @@ -1 +1 @@ -include: package:effective_dart/analysis_options.yaml +include: package:lints/recommended.yaml From f9c1cfc947bed6ad4d58f46273938875fb5568ee Mon Sep 17 00:00:00 2001 From: Robert Wilson Date: Sat, 22 Mar 2025 09:05:59 -0700 Subject: [PATCH 04/14] remove effective dart add --- .github/workflows/Development-PipeLine.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/Development-PipeLine.yml b/.github/workflows/Development-PipeLine.yml index ff448ab..575530a 100644 --- a/.github/workflows/Development-PipeLine.yml +++ b/.github/workflows/Development-PipeLine.yml @@ -33,7 +33,6 @@ jobs: - run: cd Flutter_Demo # Add formating standards - - run: flutter pub add --dev effective_dart - run: flutter pub get # Analyze From 566fa471401354f012e543788363462451044268 Mon Sep 17 00:00:00 2001 From: Robert Wilson Date: Sat, 22 Mar 2025 09:24:34 -0700 Subject: [PATCH 05/14] continue refinement --- .github/workflows/Development-PipeLine.yml | 8 +++----- Flutter_Demo/lib/main.dart | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/Development-PipeLine.yml b/.github/workflows/Development-PipeLine.yml index 575530a..fde7640 100644 --- a/.github/workflows/Development-PipeLine.yml +++ b/.github/workflows/Development-PipeLine.yml @@ -29,17 +29,15 @@ jobs: # Setup Flutter - name: Set up Flutter uses: subosito/flutter-action@v1 + # Change directory to the project - run: cd Flutter_Demo # Add formating standards - run: flutter pub get - # Analyze - - name: Analyze Flutter - uses: ValentinVignal/action-dart-analyze@v0.11 - with: - fail-on: "format" + # Add formating standards + - run: flutter pub analyze test: name: Run Unit Tests diff --git a/Flutter_Demo/lib/main.dart b/Flutter_Demo/lib/main.dart index 349dda5..1e28aff 100644 --- a/Flutter_Demo/lib/main.dart +++ b/Flutter_Demo/lib/main.dart @@ -42,6 +42,7 @@ class MyHomePage extends StatefulWidget { final String title; @override + // ignore: library_private_types_in_public_api _MyHomePageState createState() => _MyHomePageState(); } From b8df5b032cb5e7bb3420f096ee66b705606f0d87 Mon Sep 17 00:00:00 2001 From: Robert Wilson Date: Sat, 22 Mar 2025 09:35:24 -0700 Subject: [PATCH 06/14] reduce to one job --- .github/workflows/Development-PipeLine.yml | 44 ++-------------------- 1 file changed, 3 insertions(+), 41 deletions(-) diff --git a/.github/workflows/Development-PipeLine.yml b/.github/workflows/Development-PipeLine.yml index fde7640..0a30d7b 100644 --- a/.github/workflows/Development-PipeLine.yml +++ b/.github/workflows/Development-PipeLine.yml @@ -37,50 +37,12 @@ jobs: - run: flutter pub get # Add formating standards - - run: flutter pub analyze - - test: - name: Run Unit Tests - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - - name: Set up Flutter - uses: subosito/flutter-action@v1 - - # Change directory to the project - - run: cd Flutter_Demo - - run: flutter pub get + - name: Run Linting + run: flutter analyze - name: Run tests run: flutter test - build: - name: Build Project - runs-on: ubuntu-latest - - steps: - - name: Echo GITHUB variables - run: | - echo "Github Run ID- $GITHUB_RUN_ID " - echo "Github Action ID- $GITHUB_ACTION " - echo "Github Run Number- $GITHUB_RUN_NUMBER " - - - uses: actions/checkout@v2 - with: - fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - - uses: actions/setup-java@v4 - with: - distribution: 'temurin' # See 'Supported distributions' for available options - java-version: '21' - - - name: Set up Flutter - uses: subosito/flutter-action@v1 - # Change directory to the project - - run: cd Flutter_Demo - - run: flutter pub get - - name: Build APK run: flutter build apk --${{env.FLUTTER_VERSION}} @@ -97,4 +59,4 @@ jobs: uses: 'actions/upload-artifact@v4' with: name: hello-flutter-web-${{env.FLUTTER_VERSION}} - path: build/web/**/*.* + path: build/web/**/* From 17d1a9357d4801d361f8ad69a5a6566177916d45 Mon Sep 17 00:00:00 2001 From: Robert Wilson Date: Sat, 22 Mar 2025 09:39:34 -0700 Subject: [PATCH 07/14] set default path --- .github/workflows/Development-PipeLine.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Development-PipeLine.yml b/.github/workflows/Development-PipeLine.yml index 0a30d7b..8849a01 100644 --- a/.github/workflows/Development-PipeLine.yml +++ b/.github/workflows/Development-PipeLine.yml @@ -17,6 +17,10 @@ on: branches: [ developer ] paths: - Flutter_Demo/**/* +defaults: + run: + shell: bash + working-directory: ./Flutter_Demo jobs: linter: @@ -30,9 +34,6 @@ jobs: - name: Set up Flutter uses: subosito/flutter-action@v1 - # Change directory to the project - - run: cd Flutter_Demo - # Add formating standards - run: flutter pub get From 7113546262c2e8870c759e2540b0e374cf7feee4 Mon Sep 17 00:00:00 2001 From: Robert Wilson Date: Sat, 22 Mar 2025 10:01:16 -0700 Subject: [PATCH 08/14] continue refinement --- .github/workflows/Development-PipeLine.yml | 4 ++-- Flutter_Demo/.gitIgnore | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 Flutter_Demo/.gitIgnore diff --git a/.github/workflows/Development-PipeLine.yml b/.github/workflows/Development-PipeLine.yml index 8849a01..7426bf2 100644 --- a/.github/workflows/Development-PipeLine.yml +++ b/.github/workflows/Development-PipeLine.yml @@ -54,10 +54,10 @@ jobs: uses: 'actions/upload-artifact@v4' with: name: hello-flutter-apk-${{env.FLUTTER_VERSION}} - path: build/app/outputs/flutter-apk/*.apk + path: ./build/app/outputs/flutter-apk/*.apk - name: 'Upload Web Artifacts' uses: 'actions/upload-artifact@v4' with: name: hello-flutter-web-${{env.FLUTTER_VERSION}} - path: build/web/**/* + path: ./build/web/**/* diff --git a/Flutter_Demo/.gitIgnore b/Flutter_Demo/.gitIgnore new file mode 100644 index 0000000..63063a1 --- /dev/null +++ b/Flutter_Demo/.gitIgnore @@ -0,0 +1 @@ +build/**/* \ No newline at end of file From 7a8e83aa7f7f22f0765a94498a59ed29a59e0c01 Mon Sep 17 00:00:00 2001 From: Robert Wilson Date: Sat, 22 Mar 2025 10:05:21 -0700 Subject: [PATCH 09/14] update job name --- .github/workflows/Development-PipeLine.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Development-PipeLine.yml b/.github/workflows/Development-PipeLine.yml index 7426bf2..0cbc58d 100644 --- a/.github/workflows/Development-PipeLine.yml +++ b/.github/workflows/Development-PipeLine.yml @@ -23,7 +23,7 @@ defaults: working-directory: ./Flutter_Demo jobs: - linter: + Build: runs-on: ubuntu-latest name: Lint flutter code steps: From 8888b18b0c97c80d61e7fac5c7bc1e41241ec978 Mon Sep 17 00:00:00 2001 From: Robert Wilson Date: Sat, 22 Mar 2025 10:15:25 -0700 Subject: [PATCH 10/14] test upload path setting --- .github/workflows/Development-PipeLine.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Development-PipeLine.yml b/.github/workflows/Development-PipeLine.yml index 0cbc58d..c7c12b2 100644 --- a/.github/workflows/Development-PipeLine.yml +++ b/.github/workflows/Development-PipeLine.yml @@ -54,10 +54,10 @@ jobs: uses: 'actions/upload-artifact@v4' with: name: hello-flutter-apk-${{env.FLUTTER_VERSION}} - path: ./build/app/outputs/flutter-apk/*.apk + path: ./Flutter_Demo/build/app/outputs/flutter-apk/*.apk - name: 'Upload Web Artifacts' uses: 'actions/upload-artifact@v4' with: name: hello-flutter-web-${{env.FLUTTER_VERSION}} - path: ./build/web/**/* + path: ./Flutter_Demo/build/web/**/* From fc2d82e9e41d7faac26ee9770820e2086d45c706 Mon Sep 17 00:00:00 2001 From: Robert Wilson Date: Sat, 22 Mar 2025 10:17:30 -0700 Subject: [PATCH 11/14] fix web bootstrapping --- Flutter_Demo/web/index.html | 63 +------------------------------------ 1 file changed, 1 insertion(+), 62 deletions(-) diff --git a/Flutter_Demo/web/index.html b/Flutter_Demo/web/index.html index 4c11e48..60a07e8 100644 --- a/Flutter_Demo/web/index.html +++ b/Flutter_Demo/web/index.html @@ -31,68 +31,7 @@ application. For more information, see: https://developers.google.com/web/fundamentals/primers/service-workers --> From 832e77797fb5af4323a7506faee3441bfa4aa613 Mon Sep 17 00:00:00 2001 From: Robert Wilson Date: Sat, 22 Mar 2025 10:24:38 -0700 Subject: [PATCH 12/14] update Kotlin --- Flutter_Demo/android/settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Flutter_Demo/android/settings.gradle b/Flutter_Demo/android/settings.gradle index a370346..ad959ad 100644 --- a/Flutter_Demo/android/settings.gradle +++ b/Flutter_Demo/android/settings.gradle @@ -19,7 +19,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" id "com.android.application" version "8.1.1" apply false - id "org.jetbrains.kotlin.android" version "1.7.10" apply false + id "org.jetbrains.kotlin.android" version "1.8.10" apply false } include ":app" \ No newline at end of file From 538b8956a55daa6f0e9390a61e4ea00a04dba927 Mon Sep 17 00:00:00 2001 From: Robert Wilson Date: Sat, 22 Mar 2025 10:27:39 -0700 Subject: [PATCH 13/14] rename job --- .github/workflows/Development-PipeLine.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Development-PipeLine.yml b/.github/workflows/Development-PipeLine.yml index c7c12b2..c4c46a8 100644 --- a/.github/workflows/Development-PipeLine.yml +++ b/.github/workflows/Development-PipeLine.yml @@ -25,7 +25,7 @@ defaults: jobs: Build: runs-on: ubuntu-latest - name: Lint flutter code + name: Linter, test, Build, deploy steps: - name: Checkout code uses: actions/checkout@v2 From 087927d1a8af2c1005d82c108a9af47fb8830cad Mon Sep 17 00:00:00 2001 From: Robert Wilson Date: Sat, 22 Mar 2025 10:39:18 -0700 Subject: [PATCH 14/14] udpate jvm --- Flutter_Demo/android/app/build.gradle | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Flutter_Demo/android/app/build.gradle b/Flutter_Demo/android/app/build.gradle index 228f7b2..f5c2a3e 100644 --- a/Flutter_Demo/android/app/build.gradle +++ b/Flutter_Demo/android/app/build.gradle @@ -5,6 +5,15 @@ plugins { } android { + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + namespace = "com.example.dev_sec_ops_hello_world" compileSdk = flutter.compileSdkVersion ndkVersion = flutter.ndkVersion @@ -30,3 +39,5 @@ android { flutter { source '../..' } + +