diff --git a/.dart_tool/package_config.json b/.dart_tool/package_config.json index 5c16a1a..efd0cb6 100644 --- a/.dart_tool/package_config.json +++ b/.dart_tool/package_config.json @@ -3,9 +3,9 @@ "packages": [ { "name": "async", - "rootUri": "file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.8.2", + "rootUri": "file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "boolean_selector", @@ -15,19 +15,13 @@ }, { "name": "characters", - "rootUri": "file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.0", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "charcode", - "rootUri": "file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.3.1", + "rootUri": "file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "clock", - "rootUri": "file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0", + "rootUri": "file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, @@ -45,7 +39,7 @@ }, { "name": "fake_async", - "rootUri": "file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.0", + "rootUri": "file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1", "packageUri": "lib/", "languageVersion": "2.12" }, @@ -53,7 +47,7 @@ "name": "flutter", "rootUri": "file:///Users/m97chahboun/Development/flutter/packages/flutter", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.17" }, { "name": "flutter_lints", @@ -75,25 +69,25 @@ }, { "name": "matcher", - "rootUri": "file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.11", + "rootUri": "file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "material_color_utilities", - "rootUri": "file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.4", + "rootUri": "file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5", "packageUri": "lib/", "languageVersion": "2.13" }, { "name": "meta", - "rootUri": "file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.7.0", + "rootUri": "file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "path", - "rootUri": "file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.1", + "rootUri": "file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2", "packageUri": "lib/", "languageVersion": "2.12" }, @@ -105,7 +99,7 @@ }, { "name": "source_span", - "rootUri": "file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.2", + "rootUri": "file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0", "packageUri": "lib/", "languageVersion": "2.14" }, @@ -123,19 +117,19 @@ }, { "name": "string_scanner", - "rootUri": "file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0", + "rootUri": "file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "term_glyph", - "rootUri": "file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0", + "rootUri": "file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "test_api", - "rootUri": "file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.9", + "rootUri": "file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12", "packageUri": "lib/", "languageVersion": "2.12" }, @@ -152,7 +146,7 @@ "languageVersion": "2.17" } ], - "generated": "2022-08-26T10:19:54.264774Z", + "generated": "2022-10-16T13:25:49.137217Z", "generator": "pub", - "generatorVersion": "2.17.6" + "generatorVersion": "2.18.1" } diff --git a/.dart_tool/package_config_subset b/.dart_tool/package_config_subset index 882c4f6..5f5c4f9 100644 --- a/.dart_tool/package_config_subset +++ b/.dart_tool/package_config_subset @@ -1,23 +1,19 @@ async -2.12 -file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.8.2/ -file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.8.2/lib/ +2.14 +file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0/ +file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0/lib/ boolean_selector 2.12 file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/ file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/ characters 2.12 -file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.0/ -file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.0/lib/ -charcode -2.12 -file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.3.1/ -file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.3.1/lib/ +file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1/ +file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1/lib/ clock 2.12 -file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/ -file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/lib/ +file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1/ +file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1/lib/ collection 2.12 file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0/ @@ -28,8 +24,8 @@ file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-1.0.5/lib/ fake_async 2.12 -file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.0/ -file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.0/lib/ +file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1/ +file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1/lib/ flutter_lints 2.17 file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_lints-2.0.1/ @@ -40,24 +36,24 @@ file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/lints-2.0.0/lib/ matcher 2.12 -file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.11/ -file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.11/lib/ +file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12/ +file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12/lib/ material_color_utilities 2.13 -file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.4/ -file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.4/lib/ +file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5/ +file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5/lib/ meta 2.12 -file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.7.0/ -file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.7.0/lib/ +file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0/ +file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0/lib/ path 2.12 -file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.1/ -file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.1/lib/ +file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2/ +file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2/lib/ source_span 2.14 -file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.2/ -file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.2/lib/ +file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0/ +file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0/lib/ stack_trace 2.12 file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/ @@ -68,16 +64,16 @@ file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/ string_scanner 2.12 -file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/ -file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/lib/ +file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1/ +file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1/lib/ term_glyph 2.12 -file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/ -file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/lib/ +file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1/ +file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1/lib/ test_api 2.12 -file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.9/ -file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.9/lib/ +file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12/ +file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12/lib/ vector_math 2.14 file:///Users/m97chahboun/Development/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2/ @@ -87,7 +83,7 @@ sky_engine file:///Users/m97chahboun/Development/flutter/bin/cache/pkg/sky_engine/ file:///Users/m97chahboun/Development/flutter/bin/cache/pkg/sky_engine/lib/ flutter -2.12 +2.17 file:///Users/m97chahboun/Development/flutter/packages/flutter/ file:///Users/m97chahboun/Development/flutter/packages/flutter/lib/ flutter_test diff --git a/.dart_tool/version b/.dart_tool/version index 7da3c16..5436ea0 100644 --- a/.dart_tool/version +++ b/.dart_tool/version @@ -1 +1 @@ -3.0.5 \ No newline at end of file +3.3.2 \ No newline at end of file diff --git a/.github/workflows/bump-version-based-on-labels.yaml b/.github/workflows/bump-version-based-on-labels.yaml index 180f2a0..0ae8d8b 100644 --- a/.github/workflows/bump-version-based-on-labels.yaml +++ b/.github/workflows/bump-version-based-on-labels.yaml @@ -8,32 +8,22 @@ on: - closed jobs: - setup_dart_and_run_converter: + bump_version_based_on_labels: if: ${{ (github.event.pull_request.merged == true) }} runs-on: ubuntu-latest - outputs: - parts: ${{ steps.labels_to_version_parts.outputs.parts }} steps: - name: Checkout Repo uses: actions/checkout@v3 - - uses: dart-lang/setup-dart@v1.3 + - name: Setup Dart Language + uses: dart-lang/setup-dart@v1.3 - name: Convert labels to version parts - id: labels_to_version_parts - run: "dart workflows_utils/labels_to_version_parts.dart ${{ join(github.event.pull_request.labels.*.name,' ') }}" - - bump_version_based_on_labels: - if: ${{ (github.event.pull_request.merged == true) }} - runs-on: ubuntu-latest - needs: setup_dart_and_run_converter - steps: - - name: Checkout Repo - uses: actions/checkout@v3 - # Setup Ruby, Bundler, Gemfile - - name: Setup Fastlane - uses: ruby/setup-ruby@72d59482210349c1114eca714b6c5df19fbbec34 - with: - ruby-version: "2.6" - bundler-cache: true + run: "dart workflows_utils/labels_to_version_parts.dart ${{ join(github.event.pull_request.labels.*.name,' ') }}" + # Setup Ruby, Bundler, Gemfile + - name: Setup Fastlane + uses: ruby/setup-ruby@72d59482210349c1114eca714b6c5df19fbbec34 + with: + ruby-version: "2.6" + bundler-cache: true + working-directory: android + - run: bundle exec fastlane bump_version push:true branch:${{ github.ref_name }} ${{env.parts}} bump_build:false working-directory: android - - run: bundle exec fastlane bump_version push:true branch:${{ github.ref_name }} ${{needs.setup_dart_and_run_converter.outputs.parts}} bump_build:false - working-directory: android diff --git a/.github/workflows/cd-stable.yaml b/.github/workflows/cd-stable.yaml index 4fa4415..397f3df 100644 --- a/.github/workflows/cd-stable.yaml +++ b/.github/workflows/cd-stable.yaml @@ -43,27 +43,10 @@ jobs: # GCP_SA_KEY: ${{ secrets.GCP_SA_KEY }} # PROJECT_ID: default - setup_dart_and_run_scripts: - runs-on: ubuntu-latest - outputs: - track: ${{ steps.labels_to_track.outputs.track }} - project_version: ${{ steps.get_project_version.outputs.project_version }} - steps: - - name: Checkout Repo - uses: actions/checkout@v3 - - uses: dart-lang/setup-dart@v1.3 - - name: Convert labels to track - id: labels_to_track - run: "dart workflows_utils/labels_to_track.dart ${{ join(github.event.pull_request.labels.*.name,' ') }}" - - name: Get Project Version - id: get_project_version - run: "dart workflows_utils/get_project_version.dart" - - promote-android: if: ${{ (github.event.pull_request.merged == true) }} needs: setup_dart_and_run_scripts - name: Promote Android Release from ${{needs.setup_dart_and_run_scripts.outputs.track}} to production + name: Promote Android Release from ${{env.track}} to production runs-on: ubuntu-latest steps: - name: Setup Flutter @@ -74,8 +57,12 @@ jobs: # Checkout Repo code - name: Checkout Repo uses: actions/checkout@v3 - with: - token: ${{ secrets.REPO_TOKEN }} + - name: Setup Dart Language + uses: dart-lang/setup-dart@v1.3 + - name: Convert labels to track + run: "dart workflows_utils/labels_to_track.dart ${{ join(github.event.pull_request.labels.*.name,' ') }}" + - name: Get Project Version + run: "dart workflows_utils/get_project_version.dart" # Setup Ruby, Bundler, Gemfile - name: Setup Fastlane uses: ruby/setup-ruby@72d59482210349c1114eca714b6c5df19fbbec34 @@ -98,19 +85,13 @@ jobs: KEYSTORE_STORE_PASSWORD: ${{ secrets.KEYSTORE_STORE_PASSWORD }} working-directory: android - - run: bundle exec fastlane android promote from:${{needs.setup_dart_and_run_scripts.outputs.track}} to:production + - run: bundle exec fastlane android promote from:${{env.track}} to:production working-directory: android env: PLAY_STORE_CONFIG_JSON: ${{ secrets.PLAY_STORE_CONFIG_JSON }} - - create_release: - if: ${{ (github.event.pull_request.merged == true) }} - needs: setup_dart_and_run_scripts - name: "Create Release" - runs-on: "ubuntu-latest" - steps: - - uses: "marvinpinto/action-automatic-releases@latest" + - name: Create Release for ${{env.project_version}} + uses: "marvinpinto/action-automatic-releases@latest" with: repo_token: "${{ secrets.REPO_TOKEN }}" - automatic_release_tag: "${{needs.setup_dart_and_run_scripts.outputs.project_version}}" + automatic_release_tag: "${{env.project_version}}" prerelease: false \ No newline at end of file diff --git a/.github/workflows/ci-dev.yaml b/.github/workflows/ci-dev.yaml index 03a1d6d..ce34d26 100644 --- a/.github/workflows/ci-dev.yaml +++ b/.github/workflows/ci-dev.yaml @@ -24,7 +24,7 @@ jobs: run: flutter format --set-exit-if-changed . - name: Statically analyze the Dart code for any errors. - run: flutter analyze ./lib + run: flutter analyze - name: Run Test run: flutter test \ No newline at end of file diff --git a/.github/workflows/ci-staging.yaml b/.github/workflows/ci-staging.yaml index 1a9b140..0ffcab2 100644 --- a/.github/workflows/ci-staging.yaml +++ b/.github/workflows/ci-staging.yaml @@ -42,17 +42,6 @@ jobs: # env: # GCP_SA_KEY: ${{ secrets.GCP_SA_KEY }} # PROJECT_ID: default - setup_dart_and_run_converter: - runs-on: ubuntu-latest - outputs: - track: ${{ steps.labels_to_track.outputs.track }} - steps: - - name: Checkout Repo - uses: actions/checkout@v3 - - uses: dart-lang/setup-dart@v1.3 - - name: Convert labels to track - id: labels_to_track - run: "dart workflows_utils/labels_to_track.dart ${{ join(github.event.pull_request.labels.*.name,' ') }}" fastlane-deploy-staging-android: name: Deploy Android Release to Alpha track runs-on: ubuntu-latest @@ -66,8 +55,11 @@ jobs: # Checkout Repo code - name: Checkout Repo uses: actions/checkout@v3 - with: - token: ${{ secrets.REPO_TOKEN }} + - name: Setup Dart Language + uses: dart-lang/setup-dart@v1.3 + - name: Convert labels to track + id: labels_to_track + run: "dart workflows_utils/labels_to_track.dart ${{ join(github.event.pull_request.labels.*.name,' ') }}" # Setup Ruby, Bundler, Gemfile & flutter dependencies & Build Android - name: Setup Fastlane uses: ruby/setup-ruby@72d59482210349c1114eca714b6c5df19fbbec34 @@ -92,7 +84,7 @@ jobs: - run: bundle exec fastlane bump_version push:true branch:${{ github.ref_name }} working-directory: android - - run: bundle exec fastlane android deploy track:${{needs.setup_dart_and_run_converter.outputs.track}} + - run: bundle exec fastlane android deploy track:${{env.track}} working-directory: android env: PLAY_STORE_CONFIG_JSON: ${{ secrets.PLAY_STORE_CONFIG_JSON }} diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift new file mode 100644 index 0000000..cccf817 --- /dev/null +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -0,0 +1,10 @@ +// +// Generated file. Do not edit. +// + +import FlutterMacOS +import Foundation + + +func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { +} diff --git a/macos/Flutter/ephemeral/Flutter-Generated.xcconfig b/macos/Flutter/ephemeral/Flutter-Generated.xcconfig new file mode 100644 index 0000000..dda30f0 --- /dev/null +++ b/macos/Flutter/ephemeral/Flutter-Generated.xcconfig @@ -0,0 +1,11 @@ +// This is a generated file; do not edit or check into version control. +FLUTTER_ROOT=/Users/m97chahboun/Development/flutter +FLUTTER_APPLICATION_PATH=/Users/m97chahboun/Development/flutter_ci_cd +COCOAPODS_PARALLEL_CODE_SIGN=true +FLUTTER_BUILD_DIR=build +FLUTTER_BUILD_NAME=2.2.8 +FLUTTER_BUILD_NUMBER=18 +DART_OBFUSCATION=false +TRACK_WIDGET_CREATION=true +TREE_SHAKE_ICONS=false +PACKAGE_CONFIG=.dart_tool/package_config.json diff --git a/macos/Flutter/ephemeral/flutter_export_environment.sh b/macos/Flutter/ephemeral/flutter_export_environment.sh new file mode 100755 index 0000000..b882190 --- /dev/null +++ b/macos/Flutter/ephemeral/flutter_export_environment.sh @@ -0,0 +1,12 @@ +#!/bin/sh +# This is a generated file; do not edit or check into version control. +export "FLUTTER_ROOT=/Users/m97chahboun/Development/flutter" +export "FLUTTER_APPLICATION_PATH=/Users/m97chahboun/Development/flutter_ci_cd" +export "COCOAPODS_PARALLEL_CODE_SIGN=true" +export "FLUTTER_BUILD_DIR=build" +export "FLUTTER_BUILD_NAME=2.2.8" +export "FLUTTER_BUILD_NUMBER=18" +export "DART_OBFUSCATION=false" +export "TRACK_WIDGET_CREATION=true" +export "TREE_SHAKE_ICONS=false" +export "PACKAGE_CONFIG=.dart_tool/package_config.json" diff --git a/pubspec.lock b/pubspec.lock index 7bc8bdd..275f205 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,7 +7,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.8.2" + version: "2.9.0" boolean_selector: dependency: transitive description: @@ -21,21 +21,14 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.1" + version: "1.2.1" clock: dependency: transitive description: name: clock url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" collection: dependency: transitive description: @@ -56,7 +49,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.3.1" flutter: dependency: "direct main" description: flutter @@ -87,28 +80,28 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.11" + version: "0.12.12" material_color_utilities: dependency: transitive description: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.4" + version: "0.1.5" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.7.0" + version: "1.8.0" path: dependency: transitive description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.2" sky_engine: dependency: transitive description: flutter @@ -120,7 +113,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.2" + version: "1.9.0" stack_trace: dependency: transitive description: @@ -141,21 +134,21 @@ packages: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.2.1" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.9" + version: "0.4.12" vector_math: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index f210a65..d3d108b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 2.2.9+20 +version: 2.2.11+20 environment: sdk: ">=2.17.6 <3.0.0" diff --git a/tst.txt b/tst.txt new file mode 100644 index 0000000..e69de29 diff --git a/workflows_utils/add_to_output.dart b/workflows_utils/add_to_output.dart new file mode 100644 index 0000000..7e6d823 --- /dev/null +++ b/workflows_utils/add_to_output.dart @@ -0,0 +1,14 @@ +import 'dart:io'; + +Future setOutput(String item) async { + Map envVars = Platform.environment; + String? envPath = envVars["GITHUB_ENV"]; + File ghEnv = File(envPath!); + String currentContent = await ghEnv.readAsString(); + if (currentContent.isNotEmpty) { + currentContent += "\n" "$item"; + } else { + currentContent = item; + } + ghEnv.writeAsString(currentContent); +} diff --git a/workflows_utils/get_project_version.dart b/workflows_utils/get_project_version.dart index 2352260..9f8d695 100644 --- a/workflows_utils/get_project_version.dart +++ b/workflows_utils/get_project_version.dart @@ -1,11 +1,12 @@ import 'dart:io'; +import 'add_to_output.dart'; + main() async { final data = File('./pubspec.yaml'); String text = data.readAsStringSync(); String currentVersion = text.substring(text.indexOf("version: ") + 9, text.indexOf("\n", text.indexOf("version: "))); - await Process.run( - 'echo "project_version=v${currentVersion.trim()}" >> \$GITHUB_ENV', [], - runInShell: true); + String versionEnvVar = "project_version=v${currentVersion.trim()}"; + await setOutput(versionEnvVar); } diff --git a/workflows_utils/labels_to_track.dart b/workflows_utils/labels_to_track.dart index 7025a5d..3c061e2 100644 --- a/workflows_utils/labels_to_track.dart +++ b/workflows_utils/labels_to_track.dart @@ -1,13 +1,12 @@ -import 'dart:io'; +import 'add_to_output.dart'; const List options = ["alpha", "beta", "internal"]; Future main(List labels) async { List trackLabels = List.from(labels); trackLabels.removeWhere((e) => !options.contains(e)); - String track = "alpha"; + String track = "track=alpha"; if (trackLabels.isNotEmpty) { - track = trackLabels.first; + track = "track=${trackLabels.first}"; } - await Process.run('echo "track=$track" >> \$GITHUB_ENV', [], - runInShell: true); + await setOutput(track); } diff --git a/workflows_utils/labels_to_version_parts.dart b/workflows_utils/labels_to_version_parts.dart index d36a3d2..ff44a4c 100644 --- a/workflows_utils/labels_to_version_parts.dart +++ b/workflows_utils/labels_to_version_parts.dart @@ -1,4 +1,4 @@ -import 'dart:io'; +import 'add_to_output.dart'; const List options = ["major", "minor", "patch"]; Future main(List labels) async { @@ -7,8 +7,7 @@ Future main(List labels) async { String parts = ""; if (versionParts.isNotEmpty) { parts = versionParts.join(","); - parts = "bump:$parts"; + parts = "parts=bump:$parts"; } - await Process.run('echo "parts=$parts" >> \$GITHUB_ENV', [], - runInShell: true); + await setOutput(parts); } diff --git a/workflows_utils/tst.txt b/workflows_utils/tst.txt new file mode 100644 index 0000000..e69de29