Flutter 3.10, Dart 3, Gradle 8 and Xcode 14.3 support (#11)

* Updated Flutter version and dependencies * Updated Flutter version and dependencies * Refactored Dart view implementation to use switch expression * Updated Android project to use the latest Gradle version (8.0) * Updated docs * Updated Flutter version used in CI * Updated dependencies
miquido · Aug 21, 2023 · abeecb5 · abeecb5
1 parent 9df29be
commit abeecb5
Show file tree

Hide file tree

Showing 17 changed files with 142 additions and 133 deletions.
diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json
@@ -1,4 +1,4 @@
 {
-  "flutterSdkVersion": "3.7.7",
+  "flutterSdkVersion": "3.10.6",
   "flavors": {}
 }
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Install and set Flutter version
         uses: subosito/flutter-action@v2.4.0
         with:
-          flutter-version: '3.7.7'
+          flutter-version: '3.10.6'
       - name: Restore packages
         run: flutter pub get
       - name: Generate required files

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 0.1.5
+* Updated the project to match Flutter 3.10.6, Dart 3, Gradle 8 and Xcode 14.3
+
 ## 0.1.4
 * Improved performance to fix a bug causing an OutOfMemoryError on some Android devices
 

diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ Add the dependency in your `pubspec.yaml`:
 - directly in pubspec.yaml:
   ```yaml
   dependencies:
-     ar_quido: 0.1.4
+     ar_quido: 0.1.5
   ```
 ### Android
 Since the Android version depends on the EasyAR solution, you need to
@@ -41,10 +41,10 @@ in Info.plist:
 <string>Describe why your app needs camera (AR) here.</string>
 ```
 
-Also make sure, that your deployment target in project settings is set to 13.0.
+Also make sure, that your deployment target in project settings is set to at least 14.0.
 Set the same version in `ios/Podfile`:
 ```ruby
-platform :ios, '13.0'
+platform :ios, '14.0'
 ```
 
 ## Usage 🌴

diff --git a/android/build.gradle b/android/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.0'
+        classpath 'com.android.tools.build:gradle:7.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -25,6 +25,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
+    namespace 'com.miquido.ar_quido'
     compileSdkVersion 33
 
     compileOptions {

diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.miquido.ar_quido_example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
    <application
         android:label="ar_quido_example"
         android:name="${applicationName}"

diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.0.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/example/android/gradle.properties b/example/android/gradle.properties
@@ -1,3 +1,6 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -19,10 +19,10 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/permission_handler_apple/ios"
 
 SPEC CHECKSUMS:
-  ar_quido: 861cff4b7e09f8f4169ea125d8a8e1440e33c904
+  ar_quido: 893d96d3c077860a6db65c62a05c1e05e872cffd
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce
 
 PODFILE CHECKSUM: 30517025a2fecca2d72dac25f08abb5b9a8f1a56
 
-COCOAPODS: 1.12.0
+COCOAPODS: 1.12.1