📌 Allow extended_image v10 (#690)

Resolves #689

Author: AlexV525

.github/workflows/runnable.yml

@@ -88,9 +88,11 @@ jobs:
           java-version: '17'
       - uses: flutter-actions/setup-flutter@v4
         with:
+          cache: true
           channel: stable
           version: ${{ matrix.flutter-version == 'min' && env.MINIMUM_FLUTTER_VERSION || 'latest' }}
       - run: dart --version
       - run: flutter --version
       - run: flutter pub get
-      - run: cd example; flutter build apk --debug
+      - run: flutter build apk --debug
+        working-directory: ${{ github.workspace }}/example

CHANGELOG.md

@@ -11,6 +11,12 @@ that can be found in the LICENSE file. -->
 
 *None.*
 
+## 9.5.1
+
+### Improvements
+
+- Allow `extended_image` v10.
+
 ## 9.5.0
 
 ### New features

example/android/app/build.gradle

@@ -2,43 +2,50 @@ plugins {
     id "com.android.application"
     id "kotlin-android"
     id "kotlin-kapt"
+    // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
     id "dev.flutter.flutter-gradle-plugin"
 }
 
-def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
-if (localPropertiesFile.exists()) {
-    localPropertiesFile.withReader('UTF-8') { reader ->
-        localProperties.load(reader)
-    }
+def flutterVersionCode = null
+def flutterVersionName = null
+if (flutter.hasProperty('versionCode')) {
+    flutterVersionCode = flutter.versionCode
 }
-
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
+if (flutter.hasProperty('versionName')) {
+    flutterVersionName = flutter.versionName
 }
 
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
+if (flutterVersionCode == null || flutterVersionName == null) {
+    def localProperties = new Properties()
+    rootProject.file('local.properties').withReader('UTF-8') { reader ->
+        localProperties.load(reader)
+    }
+
+    if (flutterVersionCode == null) {
+        flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+    }
+    if (flutterVersionName == null) {
+        flutterVersionName = localProperties.getProperty('flutter.versionName')
+    }
 }
 
 android {
     namespace "com.fluttercandies.wechatAssetsPickerExample"
     compileSdk flutter.compileSdkVersion
-
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
+    ndkVersion flutter.ndkVersion
 
     defaultConfig {
-        applicationId "com.fluttercandies.wechatAssetsPickerExample"
-        minSdkVersion 21
-        targetSdkVersion flutter.targetSdkVersion
+        applicationId = "com.fluttercandies.wechatAssetsPickerExample"
+        minSdk 21
+        targetSdk flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
 
+    sourceSets {
+        main.java.srcDirs += 'src/main/kotlin'
+    }
+
     kotlinOptions {
         jvmTarget = '17'
     }

example/android/gradle.properties

@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true

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-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip

example/android/settings.gradle

@@ -5,10 +5,9 @@ pluginManagement {
         def flutterSdkPath = properties.getProperty("flutter.sdk")
         assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
         return flutterSdkPath
-    }
-    settings.ext.flutterSdkPath = flutterSdkPath()
+    }()
 
-    includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
     repositories {
         google()
@@ -19,8 +18,9 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.2.2" apply false
-    id "org.jetbrains.kotlin.android" version "1.9.21" apply false
+    id "com.android.application" version "8.9.1" apply false
+    id "com.android.library" version "8.9.1" apply false
+    id "org.jetbrains.kotlin.android" version "2.1.20" apply false
 }
 
 include ":app"

example/ios/Runner.xcodeproj/project.pbxproj

@@ -266,7 +266,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 

example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <MacroExpansion>
          <BuildableReference
@@ -54,11 +55,13 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
+      enableGPUValidationMode = "1"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">

example/ios/Runner/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>com.fluttercandies.wechatAssetsPickerExample</string>
+	<string>flutter_wechat_assets_picker_example</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>

example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -59,6 +59,7 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
+      enableGPUValidationMode = "1"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">

example/macos/Runner/AppDelegate.swift

@@ -1,9 +1,13 @@
 import Cocoa
 import FlutterMacOS
 
-@NSApplicationMain
+@main
 class AppDelegate: FlutterAppDelegate {
   override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
     return true
   }
+
+  override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool {
+    return true
+  }
 }

example/pubspec.yaml

@@ -1,6 +1,6 @@
 name: wechat_assets_picker_demo
 description: The demo project for the wechat_assets_picker package.
-version: 9.5.0+65
+version: 9.5.1+66
 publish_to: none
 
 environment:
@@ -28,5 +28,6 @@ dev_dependencies:
 
 flutter:
   uses-material-design: true
+  generate: true
   assets:
     - assets/

pubspec.yaml

@@ -1,5 +1,5 @@
 name: wechat_assets_picker
-version: 9.5.0
+version: 9.5.1
 description: |
   An image picker (also with videos and audio)
   for Flutter projects based on WeChat's UI,
@@ -24,7 +24,7 @@ dependencies:
 
   wechat_picker_library: ^1.0.5
 
-  extended_image: '>=8.3.0 <10.0.0'
+  extended_image: '>=8.3.0 <11.0.0'
   photo_manager: ^3.5.0
   photo_manager_image_provider: ^2.2.0
   provider: ^6.0.5