Merge branch 'master' into #292-build-ipa

Author: Luca Van Zelst

.fvm/fvm_config.json

@@ -1,4 +1,4 @@
 {
-  "flutterSdkVersion": "3.3.4",
+  "flutterSdkVersion": "3.10.6",
   "flavors": {}
 }

.github/workflows/analyzer.yml

@@ -0,0 +1,18 @@
+name: Analyzer
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  check_analyzer:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: subosito/[email protected]
+      with:
+        channel: 'stable'
+    - run: flutter packages get
+    - run: flutter analyze

.github/workflows/rename_project.yml

@@ -0,0 +1,18 @@
+name: Rename project
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  check_rename_project:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: subosito/[email protected]
+      with:
+        channel: 'stable'
+    - run: flutter packages get
+    - run: printf 'Test Project\ndescription\ntest_project\nTestProject\ncom.test.project\nn\ny\n' | flutter pub run ./tool/dart_tool/rename_project.dart

.github/workflows/strip_boilerplate_project.yaml

@@ -0,0 +1,22 @@
+name: Strip boilerplate project
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  check_strip_boilerplate_project:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: subosito/[email protected]
+      with:
+        channel: 'stable'
+    - run: flutter packages get
+    - run: ./tool/install_fvm.sh
+    - run: printf 'yes\n' | fvm flutter pub run ./tool/dart_tool/strip_boilerplate_project.dart
+    - run: fvm flutter analyze
+    - run: fvm flutter test --update-goldens test/screen/home/home_screen_test.dart
+    - run: fvm flutter test

.github/workflows/strip_boilerplate_project_remove_tests.yaml

@@ -0,0 +1,20 @@
+name: Strip boilerplate project remove tests
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  check_strip_boilerplate_project_remove_tests:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: subosito/[email protected]
+      with:
+        channel: 'stable'
+    - run: flutter packages get
+    - run: ./tool/install_fvm.sh
+    - run: printf 'no\n' | flutter pub run ./tool/dart_tool/strip_boilerplate_project.dart
+    - run: flutter analyze

.github/workflows/test.yml

@@ -0,0 +1,26 @@
+name: Test
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  test:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: subosito/[email protected]
+        with:
+          channel: 'stable'
+      - run: ./tool/install_fvm.sh
+      - run: fvm flutter packages get
+      - run: dart run ./tool/test_coverage_create_helper.dart
+      - run: fvm flutter test --coverage
+      - run: dart run ./tool/test_coverage_filter.dart
+      - run: dart run ./tool/test_coverage_validate_percentage.dart
+      - name: Coveralls
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -59,13 +59,14 @@
 **/ios/.generated/
 **/ios/Flutter/App.framework
 **/ios/Flutter/Flutter.framework
+**/ios/Flutter/Flutter.podspec
 **/ios/Flutter/Generated.xcconfig
 **/ios/Flutter/app.flx
 **/ios/Flutter/app.zip
 **/ios/Flutter/flutter_assets/
 **/ios/ServiceDefinitions.json
 **/ios/Runner/GeneratedPluginRegistrant.*
-**ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+**/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
 **/ios/Flutter/flutter_export_environment.sh
 **/ios/Flutter/.last_build_id
 

.travis.yml

@@ -6,9 +6,9 @@ analyzer:
     missing_return: error
     todo: ignore
     sdk_version_async_exported_from_core: ignore
-  strong-mode:
-    implicit-casts: false
-    implicit-dynamic: false
+  language:
+    strict-casts: true
+    strict-raw-types: false
   exclude:
     - '**.g.dart'
     - '**.config.dart'

analysis_options.yaml

@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.6.0'
+    ext.kotlin_version = '1.9.0'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.gms:google-services:4.3.8'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1'
@@ -28,6 +28,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

android/build.gradle

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,10 +2,34 @@ targets:
   $default:
     builders:
       drift_dev:
-        options:
-          generate_connect_constructor: true
+        generate_for:
+          include:
+            - lib/database/**.dart
       # Should be removed in the future
       retrofit_generator|retrofit:
         enabled: true
+        generate_for:
+          include:
+            - lib/webservice/**.dart
         options:
-          nullsafety: true
+          nullsafety: true
+      mockito:mockBuilder:
+        generate_for:
+          include:
+            - test/**.dart
+      json_serializable:
+        generate_for:
+          include:
+            - lib/model/**.dart
+      injectable_generator:injectable_config_builder:
+        generate_for:
+          include:
+            - lib/di/injectable.dart
+      flutter_navigation_generator:flutter_route_builder:
+        generate_for:
+          include:
+            - lib/screen/**.dart
+      flutter_navigation_generator:flutter_navigator_builder:
+        generate_for:
+          include:
+            - lib/navigator/main_navigator.dart

build.yaml

@@ -184,27 +184,13 @@ private_lane :buildAppAndroid do |options|
     Dir.chdir ".." do
       sh("fvm", "flutter", "build", "apk", "--release", "--flavor", options[:flavor], "-t" "lib/main_#{options[:flavor]}.dart", "--obfuscate", "--split-debug-info=./build/debug-info/#{options[:flavor]}", "--build-number=#{BUILD_NR}")    # Build the application (APK)
     end
-    Dir.chdir "../build/debug-info/#{options[:flavor]}" do
-      zip(
-        path: "./",
-        include: ["**/app.android-*"],
-        output_path: "AndroidSymbols.zip"
-      )
-    end
     upload_artifacts_to_s3(flavor: options[:flavor])
 end
 
 private_lane :buildAppBundleAndroid do |options|
     Dir.chdir ".." do
       sh("fvm", "flutter", "build", "appbundle", "--release", "--flavor", options[:flavor], "-t" "lib/main_#{options[:flavor]}.dart", "--obfuscate", "--split-debug-info=./build/debug-info/#{options[:flavor]}", "--build-number=#{BUILD_NR}")    # Build the application (AAB)
     end
-    Dir.chdir "../build/debug-info/#{options[:flavor]}" do
-      zip(
-        path: "./",
-        include: ["**/app.android-*"],
-        output_path: "AndroidSymbols.zip"
-      )
-    end
     upload_artifacts_to_s3(flavor: options[:flavor])
 end
 
@@ -249,34 +235,23 @@ end
 
 private_lane :uploadToAppcenterAndroid do |options|
   getAppNameAndroid(flavor: options[:flavor])
-  zip(
-    path: "build/debug-info/#{options[:flavor]}/",
-    include: ["**/app.android.*"],
-    output_path: "AndroidSymbols.zip"
-  )
-  sh("mv", "../AndroidSymbols.zip", "../AndroidSymbols.txt")
   appcenter_upload(
     app_name: appcenter_app_name,
     apk: "./build/app/outputs/apk/#{options[:flavor]}/release/app-#{options[:flavor]}-release.apk",
     notify_testers: true,
-    mapping: "./AndroidSymbols.txt",
     destinations: "*"
   )
+  uploadAndroidSymbols(flavor: options[:flavor])
 end
 
 private_lane :uploadToAppcenterIos do |options|
   getAppNameIOS(flavor: options[:flavor])
-  zip(
-    path: "build",
-    include: ["debug-info/#{options[:flavor]}/app.ios*", "ios/Release-#{options[:flavor]}-phoneos/Runner.app.dSYM/*"],
-    output_path: "iOSSymbols.zip"
-  )
   appcenter_upload(
     app_name: appcenter_app_name,
     notify_testers: true,
-    dsym: "./iOSSymbols.zip",
     destinations: "*"
   )
+  uploadIOSSymbols(flavor: options[:flavor])
 end
 
 private_lane :add_tag do
@@ -343,7 +318,7 @@ private_lane :deployToAppStore do |options|
     skip_submission:                   true,
     skip_waiting_for_build_processing: true,
   )
-  uploadSymbols()
+  uploadIOSSymbols(flavor: options[:flavor])
 end
 
 private_lane :deployToPlayStore do |options|
@@ -354,12 +329,19 @@ private_lane :deployToPlayStore do |options|
     aab: "./build/app/outputs/bundle/#{options[:flavor]}Release/app-#{options[:flavor]}-release.aab",
     json_key: 'google_playstore_api.json'
   )
+  uploadAndroidSymbols(flavor: options[:flavor])
 end
 
-private_lane :uploadSymbols do
-  Dir.chdir ".." do
-       sh("ios/Pods/FirebaseCrashlytics/upload-symbols", "-gsp" ,"ios/Runner/GoogleService-Info.plist", "-p", "ios", "Runner.app.dSYM.zip")    # Upload dSYM files to crashlytics
-  end
+private_lane :uploadIOSSymbols do |options|
+   Dir.chdir ".." do
+     sh("dart", "run", "./tool/dart_tool/firebase/firebase_uploader.dart", "ios", "#{options[:flavor]}")
+   end
+end
+
+private_lane :uploadAndroidSymbols do |options|
+   Dir.chdir ".." do
+     sh("dart", "run", "./tool/dart_tool/firebase/firebase_uploader.dart", "android", "#{options[:flavor]}", "build/debug-info/#{options[:flavor]}")
+   end
 end
 
 private_lane :upload_artifacts_to_s3 do |options|