Disallow melos v7 temporary (#2446)

AlexV525 · web-flow · commit ead55dd51be0 · 2025-09-22T10:22:31.000+08:00
...in order to keep our CI green.

---------

Signed-off-by: Alex Li &lt;github@alexv525.com&gt;
diff --git a/.github/workflows/coverage_base.yml b/.github/workflows/coverage_base.yml
@@ -36,6 +36,7 @@ jobs:
       - uses: bluefireteam/melos-action@v3
         with:
           run-bootstrap: false
+          melos-version: '^6.0.0'
       - name: Check satisfied packages
         run: |
           dart ./scripts/melos_packages.dart
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -46,6 +46,7 @@ jobs:
       - uses: bluefireteam/melos-action@v3
         with:
           run-bootstrap: false
+          melos-version: ${{ matrix.sdk == 'min' && '3.4.0' || '^6.0.0' }}
       - name: Remove dio_web_adapter overrides
         if: ${{ matrix.sdk == 'min' }}
         run: rm -rf plugins/web_adapter
diff --git a/example_flutter_app/.metadata b/example_flutter_app/.metadata
@@ -4,7 +4,7 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: "8495dee1fd4aacbe9de707e7581203232f591b2f"
+  revision: "edada7c56edf4a183c1735310e123c7f923584f1"
   channel: "stable"
 
 project_type: app
@@ -13,26 +13,26 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
-      base_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
+      create_revision: edada7c56edf4a183c1735310e123c7f923584f1
+      base_revision: edada7c56edf4a183c1735310e123c7f923584f1
     - platform: android
-      create_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
-      base_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
+      create_revision: edada7c56edf4a183c1735310e123c7f923584f1
+      base_revision: edada7c56edf4a183c1735310e123c7f923584f1
     - platform: ios
-      create_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
-      base_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
+      create_revision: edada7c56edf4a183c1735310e123c7f923584f1
+      base_revision: edada7c56edf4a183c1735310e123c7f923584f1
     - platform: linux
-      create_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
-      base_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
+      create_revision: edada7c56edf4a183c1735310e123c7f923584f1
+      base_revision: edada7c56edf4a183c1735310e123c7f923584f1
     - platform: macos
-      create_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
-      base_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
+      create_revision: edada7c56edf4a183c1735310e123c7f923584f1
+      base_revision: edada7c56edf4a183c1735310e123c7f923584f1
     - platform: web
-      create_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
-      base_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
+      create_revision: edada7c56edf4a183c1735310e123c7f923584f1
+      base_revision: edada7c56edf4a183c1735310e123c7f923584f1
     - platform: windows
-      create_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
-      base_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
+      create_revision: edada7c56edf4a183c1735310e123c7f923584f1
+      base_revision: edada7c56edf4a183c1735310e123c7f923584f1
 
   # User provided section
 
diff --git a/example_flutter_app/android/.gitignore b/example_flutter_app/android/.gitignore
@@ -1,10 +1,12 @@
 gradle-wrapper.jar
 /.gradle
+/.kotlin
 /captures/
 /gradlew
 /gradlew.bat
 /local.properties
 GeneratedPluginRegistrant.java
+.cxx/
 
 # Remember to never publicly share your keystore.
 # See https://flutter.dev/to/reference-keystore
diff --git a/example_flutter_app/android/app/build.gradle.kts b/example_flutter_app/android/app/build.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
-    id "com.android.application"
-    id "kotlin-android"
+    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"
+    id("dev.flutter.flutter-gradle-plugin")
 }
 
 android {
@@ -11,12 +11,12 @@ android {
     ndkVersion = flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8
+        jvmTarget = JavaVersion.VERSION_11.toString()
     }
 
     defaultConfig {
@@ -34,7 +34,7 @@ android {
         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.debug
+            signingConfig = signingConfigs.getByName("debug")
         }
     }
 }
diff --git a/example_flutter_app/android/app/src/main/kotlin/cn/flutter/dio_flutter_example/MainActivity.kt b/example_flutter_app/android/app/src/main/kotlin/cn/flutter/dio_flutter_example/MainActivity.kt
@@ -2,4 +2,4 @@ package cn.flutter.dio_flutter_example
 
 import io.flutter.embedding.android.FlutterActivity
 
-class MainActivity: FlutterActivity()
+class MainActivity : FlutterActivity()
diff --git a/example_flutter_app/android/build.gradle b/example_flutter_app/android/build.gradle
diff --git a/example_flutter_app/android/build.gradle.kts b/example_flutter_app/android/build.gradle.kts
@@ -0,0 +1,21 @@
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+val newBuildDir: Directory = rootProject.layout.buildDirectory.dir("../../build").get()
+rootProject.layout.buildDirectory.value(newBuildDir)
+
+subprojects {
+    val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name)
+    project.layout.buildDirectory.value(newSubprojectBuildDir)
+}
+subprojects {
+    project.evaluationDependsOn(":app")
+}
+
+tasks.register<Delete>("clean") {
+    delete(rootProject.layout.buildDirectory)
+}
diff --git a/example_flutter_app/android/gradle.properties b/example_flutter_app/android/gradle.properties
@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
+org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true
diff --git a/example_flutter_app/android/gradle/wrapper/gradle-wrapper.properties b/example_flutter_app/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-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
diff --git a/example_flutter_app/android/settings.gradle b/example_flutter_app/android/settings.gradle
diff --git a/example_flutter_app/android/settings.gradle.kts b/example_flutter_app/android/settings.gradle.kts
@@ -0,0 +1,25 @@
+pluginManagement {
+    val flutterSdkPath = run {
+        val properties = java.util.Properties()
+        file("local.properties").inputStream().use { properties.load(it) }
+        val flutterSdkPath = properties.getProperty("flutter.sdk")
+        require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
+        flutterSdkPath
+    }
+
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
+
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+plugins {
+    id("dev.flutter.flutter-plugin-loader") version "1.0.0"
+    id("com.android.application") version "8.13.0" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.20" apply false
+}
+
+include(":app")
diff --git a/example_flutter_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example_flutter_app/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">
diff --git a/example_flutter_app/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example_flutter_app/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -59,6 +59,7 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
+      enableGPUValidationMode = "1"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -7,7 +7,7 @@ environment:
 
 dev_dependencies:
   lints: any
-  melos: any
+  melos: '>=3.0.0 <7.0.0'
   cli_util: any # Required by custom melos command.
   path: any # Required by custom melos command.
   pub_semver: any # Required by custom melos command.

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`plugins {`
`2`		`- id "com.android.application"`
`3`		`- id "kotlin-android"`
	`2`	`+ id("com.android.application")`
	`3`	`+ id("kotlin-android")`
`4`	`4`	`// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.`
`5`		`- id "dev.flutter.flutter-gradle-plugin"`
	`5`	`+ id("dev.flutter.flutter-gradle-plugin")`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`android {`
`@@ -11,12 +11,12 @@ android {`
`11`	`11`	`ndkVersion = flutter.ndkVersion`
`12`	`12`
`13`	`13`	`compileOptions {`
`14`		`- sourceCompatibility = JavaVersion.VERSION_1_8`
`15`		`- targetCompatibility = JavaVersion.VERSION_1_8`
	`14`	`+ sourceCompatibility = JavaVersion.VERSION_11`
	`15`	`+ targetCompatibility = JavaVersion.VERSION_11`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`kotlinOptions {`
`19`		`- jvmTarget = JavaVersion.VERSION_1_8`
	`19`	`+ jvmTarget = JavaVersion.VERSION_11.toString()`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`defaultConfig {`
`@@ -34,7 +34,7 @@ android {`
`34`	`34`	`release {`
`35`	`35`	`// TODO: Add your own signing config for the release build.`
`36`	`36`	// Signing with the debug keys for now, so `flutter run --release` works.
`37`		`- signingConfig = signingConfigs.debug`
	`37`	`+ signingConfig = signingConfigs.getByName("debug")`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@ package cn.flutter.dio_flutter_example`
`2`	`2`
`3`	`3`	`import io.flutter.embedding.android.FlutterActivity`
`4`	`4`
`5`		`-class MainActivity: FlutterActivity()`
	`5`	`+class MainActivity : FlutterActivity()`