Skip to content

Commit bb0d0c3

Browse files
committed
Merge upstream/main to resolve conflicts
- Bump image_picker_ios to 0.8.13+10 (0.8.13+9 was taken upstream) - Port undecodable image test to Swift Testing after ObjC tests were migrated
2 parents a1f0422 + 5620e65 commit bb0d0c3

596 files changed

Lines changed: 12276 additions & 12942 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.ci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ platform_properties:
9898
[
9999
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
100100
]
101-
os: Mac-15.7
101+
os: Mac-15.7|Mac-26.6
102102
device_type: none
103103
cpu: arm64
104104
$flutter/osx_sdk : >-

‎.ci/flutter_master.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4fcd90be004504fd33ea86bb14b93e9202103496
1+
e89fd0a274aefdfd4f08bb8c9314e5888b5f06da

‎.ci/flutter_stable.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6a19cca56475dbfba1478ee68d7bd0c2ef891da1
1+
5fc346839b5d0eef006ed8404392afb4dfae428d

‎README.md‎

Lines changed: 3 additions & 3 deletions
Large diffs are not rendered by default.

‎packages/animations/example/android/gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m
22
android.useAndroidX=true
33

44
# This builtInKotlin flag was added automatically by Flutter migrator
5-
android.builtInKotlin=false
5+
android.builtInKotlin=true
66
# This newDsl flag was added automatically by Flutter migrator
77
android.newDsl=false

‎packages/camera/camera/example/android/gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ org.gradle.jvmargs=-Xmx4G
22
android.useAndroidX=true
33

44
# This builtInKotlin flag was added automatically by Flutter migrator
5-
android.builtInKotlin=false
5+
android.builtInKotlin=true
66
# This newDsl flag was added automatically by Flutter migrator
77
android.newDsl=false

‎packages/camera/camera_android/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.10.12+1
2+
3+
* Updates Robolectric to 4.17 and adds the JVM arguments it requires for unit tests.
4+
15
## 0.10.12
26

37
* Adds support for custom video output path in video recording.

‎packages/camera/camera_android/android/build.gradle.kts‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,19 @@ android {
6666
// sets the heap size to a size large enough to run the robolectric tests across
6767
// multiple SDK levels.
6868
it.jvmArgs("-Xmx4G")
69+
// Recommended flag set starting Robolectric 4.17 for JDK 17+, see
70+
// https://robolectric.org/getting-started/#running-with-java-17-and-higher
71+
it.jvmArgs(
72+
"--add-opens=java.base/java.lang=ALL-UNNAMED",
73+
"--add-opens=java.base/java.util=ALL-UNNAMED",
74+
"--add-opens=java.base/java.io=ALL-UNNAMED",
75+
"--add-opens=java.base/java.net=ALL-UNNAMED",
76+
"--add-opens=java.base/java.security=ALL-UNNAMED",
77+
"--add-opens=java.base/java.text=ALL-UNNAMED",
78+
"--add-opens=java.base/jdk.internal.access=ALL-UNNAMED",
79+
"--add-opens=java.desktop/java.awt.font=ALL-UNNAMED",
80+
"--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
81+
)
6982
}
7083
}
7184
}
@@ -76,5 +89,5 @@ dependencies {
7689
testImplementation("junit:junit:4.13.2")
7790
testImplementation("org.mockito:mockito-core:5.23.0")
7891
testImplementation("androidx.test:core:1.7.0")
79-
testImplementation("org.robolectric:robolectric:4.16")
92+
testImplementation("org.robolectric:robolectric:4.17")
8093
}

‎packages/camera/camera_android/example/android/build.gradle.kts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@ gradle.projectsEvaluated {
4040
project(":camera_android") {
4141
tasks.withType<JavaCompile> {
4242
options.compilerArgs.addAll(listOf("-Xlint:all", "-Werror"))
43+
// javac 23+ adds the dangling-doc-comments lint, which flags the header
44+
// comment of the AGP-generated BuildConfig.java. See b/567587949 for more
45+
// details.
46+
if (JavaVersion.current() >= JavaVersion.VERSION_23) {
47+
options.compilerArgs.add("-Xlint:-dangling-doc-comments")
48+
}
4349
}
4450
}
4551
}

‎packages/camera/camera_android/example/android/gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ org.gradle.jvmargs=-Xmx4G
22
android.useAndroidX=true
33

44
# This builtInKotlin flag was added automatically by Flutter migrator
5-
android.builtInKotlin=false
5+
android.builtInKotlin=true
66
# This newDsl flag was added automatically by Flutter migrator
77
android.newDsl=false

0 commit comments

Comments
 (0)