Update cache key (#56)

Fix

Restart cache for all commands

Update podfile

Update cache key

Update flutter version

fix

Gradle migration

Multiple fixes

Update gradel version

Fix pipeline

Remove dev orb publish

Fix pipeline

Go back to orb-tools 11

Use gradlew

Generate apk

Change order

Fix

Fix

Add debug

Fix

update settings gradle

Update project

Commit some extra files

Update android image

Remove rvm check for android

Migrate to orb tools 12

fix

fix

fix

Author: marboledacci

.circleci/config.yml

@@ -1,8 +1,8 @@
 version: 2.1
 setup: true
 orbs:
-  orb-tools: circleci/orb-tools@11.1
-  shellcheck: circleci/shellcheck@3.1
+  orb-tools: circleci/orb-tools@12.3.1
+  shellcheck: circleci/shellcheck@3.4
 
 filters: &filters
   tags:
@@ -21,18 +21,10 @@ workflows:
       - shellcheck/check:
           exclude: SC2148,SC2038,SC2086,SC2002,SC2016
           filters: *filters
-      - orb-tools/publish:
-          orb-name: circleci/flutter
-          github-token: GHI_TOKEN
-          vcs-type: << pipeline.project.type >>
-          requires:
-            [orb-tools/lint, orb-tools/review, orb-tools/pack, shellcheck/check]
-          # Use a context to hold your publishing token.
-          context: orb-publisher
-          filters: *filters
       # Triggers the next workflow in the Orb Development Kit.
       - orb-tools/continue:
-          pipeline-number: << pipeline.number >>
-          vcs-type: << pipeline.project.type >>
-          requires: [orb-tools/publish]
+          orb_name: flutter
+          pipeline_number: << pipeline.number >>
+          vcs_type: << pipeline.project.type >>
+          requires: [orb-tools/lint, orb-tools/review, orb-tools/pack, shellcheck/check]
           filters: *filters

.circleci/test-deploy.yml

@@ -1,62 +1,76 @@
 version: 2.1
 orbs:
-  flutter: circleci/flutter@dev:<<pipeline.git.revision>>
-  orb-tools: circleci/orb-tools@11.1
-  android: circleci/android@3.0.1
+  flutter: {}
+  orb-tools: circleci/orb-tools@12.3.1
+  android: circleci/android@3.1.0
+parameters:
+  cache_version:
+    type: string
+    default: v1.2
 filters: &filters
   tags:
     only: /.*/
 jobs:
   integration-test-macos:
     macos:
-      xcode: 14.2.0
+      xcode: 16.3.0
     resource_class: macos.m1.large.gen1
     steps:
       - checkout
       - flutter/install_sdk_and_pub:
-          app-dir: ./sample
+          cache_version: <<pipeline.parameters.cache_version >>
+          version: 3.32.7
+          app_dir: ./sample
       - flutter/install_ios_pod:
-          repo-update: true
-          app-dir: ./sample
+          cache_version: <<pipeline.parameters.cache_version >>
+          repo_update: true
+          app_dir: ./sample
       - flutter/install_ios_gem:
-          app-dir: ./sample
+          cache_version: <<pipeline.parameters.cache_version >>
+          app_dir: ./sample
       - run:
           name: 'check that the sdk is installed properly'
           command: cd sample && flutter doctor && rbenv version
   integration-test-channel-beta:
     macos:
-      xcode: 14.2.0
+      xcode: 16.3.0
     resource_class: macos.m1.large.gen1
     steps:
       - checkout
       - flutter/install_sdk_and_pub:
-          app-dir: ./sample
+          cache_version: <<pipeline.parameters.cache_version >>
+          app_dir: ./sample
           channel: beta
           version: 3.27.0-0.1.pre
       - flutter/install_ios_pod:
-          repo-update: true
-          app-dir: ./sample
+          cache_version: <<pipeline.parameters.cache_version >>
+          repo_update: true
+          app_dir: ./sample
       - flutter/install_ios_gem:
-          app-dir: ./sample
+          cache_version: <<pipeline.parameters.cache_version >>
+          app_dir: ./sample
       - run:
           name: 'check that the sdk is installed properly from the beta channel'
           command: cd sample && flutter doctor && rbenv version
   integration-test-linux:
     executor:
       name: android/android_machine
-      tag: '2022.12.1'
+      tag: '2024.11.1'
     steps:
       - checkout
       - flutter/install_sdk_and_pub:
-          cache-version: v2
-          app-dir: ./sample
+          version: 3.32.7
+          cache_version: <<pipeline.parameters.cache_version >>
+          app_dir: ./sample
       - flutter/install_android_gradle_dependencies:
-          app-dir: ./sample
+          cache_version: <<pipeline.parameters.cache_version >>
+          app_dir: ./sample
       - flutter/install_android_gem:
-          app-dir: ./sample
+          cache_version: <<pipeline.parameters.cache_version >>
+          app_dir: ./sample
       - run:
           name: 'check that the sdk is installed properly'
-          command: cd sample && flutter doctor && rvm version
+          command: cd sample && flutter doctor
 workflows:
   test-deploy:
     jobs:
@@ -68,20 +82,22 @@ workflows:
       - integration-test-linux:
           filters: *filters
       - flutter/unit_test:
-          app-dir: ./sample
-          registry: "ghcr.io/cirruslabs"
-          version: "3.7.7"
+          cache_version: <<pipeline.parameters.cache_version >>
+          app_dir: ./sample
+          version: "3.32.7"
           filters: *filters
       - flutter/lint:
-          app-dir: ./sample
+          version: 3.32.7
+          cache_version: <<pipeline.parameters.cache_version >>
+          app_dir: ./sample
           filters: *filters
       - orb-tools/pack:
           filters: *filters
       - orb-tools/publish:
-          orb-name: circleci/flutter
-          vcs-type: << pipeline.project.type >>
-          github-token: GHI_TOKEN
-          pub-type: production
+          orb_name: circleci/flutter
+          vcs_type: << pipeline.project.type >>
+          github_token: GHI_TOKEN
+          pub_type: production
           requires:
             - orb-tools/pack
             - integration-test-macos

sample/.metadata

@@ -4,7 +4,42 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: d79295af24c3ed621c33713ecda14ad196fd9c31
-  channel: stable
+  revision: "d7b523b356d15fb81e7d340bbe52b47f93937323"
+  channel: "stable"
 
 project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: d7b523b356d15fb81e7d340bbe52b47f93937323
+      base_revision: d7b523b356d15fb81e7d340bbe52b47f93937323
+    - platform: android
+      create_revision: d7b523b356d15fb81e7d340bbe52b47f93937323
+      base_revision: d7b523b356d15fb81e7d340bbe52b47f93937323
+    - platform: ios
+      create_revision: d7b523b356d15fb81e7d340bbe52b47f93937323
+      base_revision: d7b523b356d15fb81e7d340bbe52b47f93937323
+    - platform: linux
+      create_revision: d7b523b356d15fb81e7d340bbe52b47f93937323
+      base_revision: d7b523b356d15fb81e7d340bbe52b47f93937323
+    - platform: macos
+      create_revision: d7b523b356d15fb81e7d340bbe52b47f93937323
+      base_revision: d7b523b356d15fb81e7d340bbe52b47f93937323
+    - platform: web
+      create_revision: d7b523b356d15fb81e7d340bbe52b47f93937323
+      base_revision: d7b523b356d15fb81e7d340bbe52b47f93937323
+    - platform: windows
+      create_revision: d7b523b356d15fb81e7d340bbe52b47f93937323
+      base_revision: d7b523b356d15fb81e7d340bbe52b47f93937323
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'

sample/analysis_options.yaml

@@ -0,0 +1,28 @@
+# This file configures the analyzer, which statically analyzes Dart code to
+# check for errors, warnings, and lints.
+#
+# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
+# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
+# invoked from the command line by running `flutter analyze`.
+
+# The following line activates a set of recommended lints for Flutter apps,
+# packages, and plugins designed to encourage good coding practices.
+include: package:flutter_lints/flutter.yaml
+
+linter:
+  # The lint rules applied to this project can be customized in the
+  # section below to disable rules from the `package:flutter_lints/flutter.yaml`
+  # included above or to enable additional rules. A list of all available lints
+  # and their documentation is published at https://dart.dev/lints.
+  #
+  # Instead of disabling a lint rule for the entire project in the
+  # section below, it can also be suppressed for a single line of code
+  # or a specific dart file by using the `// ignore: name_of_lint` and
+  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
+  # producing the lint.
+  rules:
+    # avoid_print: false  # Uncomment to disable the `avoid_print` rule
+    # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
+
+# Additional information about this file can be found at
+# https://dart.dev/guides/language/analysis-options

sample/android/.gitignore

@@ -1,8 +1,8 @@
-gradle-wrapper.jar
+# gradle-wrapper.jar
 /.gradle
 /captures/
-/gradlew
-/gradlew.bat
+# /gradlew
+# /gradlew.bat
 /local.properties
 GeneratedPluginRegistrant.java
 

sample/android/app/build.gradle

@@ -0,0 +1,44 @@
+plugins {
+    id("com.android.application")
+    id("kotlin-android")
+    // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
+    id("dev.flutter.flutter-gradle-plugin")
+}
+
+android {
+    namespace = "com.example.sample"
+    compileSdk = flutter.compileSdkVersion
+    ndkVersion = flutter.ndkVersion
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_11.toString()
+    }
+
+    defaultConfig {
+        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
+        applicationId = "com.example.sample"
+        // You can update the following values to match your application needs.
+        // For more information, see: https://flutter.dev/to/review-gradle-config.
+        minSdk = flutter.minSdkVersion
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutter.versionCode
+        versionName = flutter.versionName
+    }
+
+    buildTypes {
+        release {
+            // TODO: Add your own signing config for the release build.
+            // Signing with the debug keys for now, so `flutter run --release` works.
+            signingConfig = signingConfigs.getByName("debug")
+        }
+    }
+}
+
+flutter {
+    source = "../.."
+}