Skip to content

Commit ca20ed3

Browse files
authored
fix: regenerate gradle lockfiles for external_textures integration test (flutter#192657)
Update gradle lockfile for external_textures integration test. generate_gradle_lockfiles.dart skips this test because it doesn't use a main.dart. Not sure if we want to continue skipping this test or not (if not will file in another PR). Partially addresses flutter#192654 ## Pre-launch Checklist - [X] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [X] I read the [AI contribution guidelines] and understand my responsibilities, or I am not using AI tools. - [X] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [X] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [X] I signed the [CLA]. - [X] I listed at least one issue that this PR fixes in the description above. - [X] I updated/added relevant in-code documentation (doc comments with `///`). - [X] If this PR introduces a new feature or capability, I created and linked a website documentation issue or PR in [flutter/website] (or verified none is needed). - [X] I added new tests to check the change I am making, or this PR is [test-exempt]. - [X] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [X] All existing and new tests are passing.
1 parent d73ddcb commit ca20ed3

5 files changed

Lines changed: 339 additions & 137 deletions

File tree

‎dev/integration_tests/external_textures/android/build.gradle‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,23 @@ allprojects {
1313
}
1414
}
1515

16-
rootProject.buildDir = '../build'
16+
rootProject.layout.buildDirectory.value(rootProject.layout.buildDirectory.dir("../../build").get())
1717

1818
subprojects {
19-
project.buildDir = "${rootProject.buildDir}/${project.name}"
19+
project.layout.buildDirectory.value(rootProject.layout.buildDirectory.dir(project.name).get())
2020
}
2121
subprojects {
2222
project.evaluationDependsOn(':app')
2323
dependencyLocking {
2424
ignoredDependencies.add('io.flutter:*')
2525
lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile")
26-
if (!project.hasProperty('local-engine-repo')) {
26+
def ignoreFile = file("${rootProject.projectDir}/.ignore-locking.md")
27+
if (!ignoreFile.exists() && !project.hasProperty('local-engine-repo')) {
2728
lockAllConfigurations()
2829
}
2930
}
3031
}
3132

3233
tasks.register("clean", Delete) {
33-
delete rootProject.buildDir
34+
delete rootProject.layout.buildDirectory
3435
}
Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
# This is a Gradle generated file for dependency locking.
2+
# Manual edits can break the build and are not advised.
3+
# This file is expected to be part of source control.
4+
androidx.databinding:databinding-common:9.1.0=classpath
5+
androidx.databinding:databinding-compiler-common:9.1.0=classpath
6+
com.android.application:com.android.application.gradle.plugin:9.1.0=classpath
7+
com.android.databinding:baseLibrary:9.1.0=classpath
8+
com.android.tools.analytics-library:crash:32.1.0=classpath
9+
com.android.tools.analytics-library:protos:32.1.0=classpath
10+
com.android.tools.analytics-library:shared:32.1.0=classpath
11+
com.android.tools.analytics-library:tracker:32.1.0=classpath
12+
com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10=classpath
13+
com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10=classpath
14+
com.android.tools.build:aapt2-proto:9.1.0-14792394=classpath
15+
com.android.tools.build:aaptcompiler:9.1.0=classpath
16+
com.android.tools.build:apksig:9.1.0=classpath
17+
com.android.tools.build:apkzlib:9.1.0=classpath
18+
com.android.tools.build:builder-model:9.1.0=classpath
19+
com.android.tools.build:builder-test-api:9.1.0=classpath
20+
com.android.tools.build:builder:9.1.0=classpath
21+
com.android.tools.build:bundletool:1.18.3=classpath
22+
com.android.tools.build:gradle-api:9.1.0=classpath
23+
com.android.tools.build:gradle-common-api:9.1.0=classpath
24+
com.android.tools.build:gradle-settings-api:9.1.0=classpath
25+
com.android.tools.build:gradle:9.1.0=classpath
26+
com.android.tools.build:manifest-merger:32.1.0=classpath
27+
com.android.tools.ddms:ddmlib:32.1.0=classpath
28+
com.android.tools.layoutlib:layoutlib-api:32.1.0=classpath
29+
com.android.tools.lint:lint-model:32.1.0=classpath
30+
com.android.tools.lint:lint-typedef-remover:32.1.0=classpath
31+
com.android.tools.utp:gradle-work-action-api:32.1.0=classpath
32+
com.android.tools:annotations:32.1.0=classpath
33+
com.android.tools:common:32.1.0=classpath
34+
com.android.tools:dvlib:32.1.0=classpath
35+
com.android.tools:repository:32.1.0=classpath
36+
com.android.tools:sdk-common:32.1.0=classpath
37+
com.android.tools:sdklib:32.1.0=classpath
38+
com.android:signflinger:9.1.0=classpath
39+
com.android:zipflinger:9.1.0=classpath
40+
com.google.auto.value:auto-value-annotations:1.6.2=classpath
41+
com.google.code.findbugs:jsr305:3.0.2=classpath
42+
com.google.code.gson:gson:2.11.0=classpath
43+
com.google.crypto.tink:tink:1.7.0=classpath
44+
com.google.dagger:dagger:2.28.3=classpath
45+
com.google.errorprone:error_prone_annotations:2.28.0=classpath
46+
com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
47+
com.google.guava:failureaccess:1.0.2=classpath
48+
com.google.guava:guava:33.3.1-jre=classpath
49+
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
50+
com.google.j2objc:j2objc-annotations:3.0.0=classpath
51+
com.google.jimfs:jimfs:1.1=classpath
52+
com.google.protobuf:protobuf-java-util:3.25.5=classpath
53+
com.google.protobuf:protobuf-java:3.25.5=classpath
54+
com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath
55+
com.squareup:javapoet:1.13.0=classpath
56+
com.squareup:javawriter:2.5.0=classpath
57+
com.sun.istack:istack-commons-runtime:3.0.8=classpath
58+
com.sun.xml.fastinfoset:FastInfoset:1.2.16=classpath
59+
commons-codec:commons-codec:1.17.1=classpath
60+
commons-io:commons-io:2.16.1=classpath
61+
commons-logging:commons-logging:1.2=classpath
62+
jakarta.activation:jakarta.activation-api:1.2.1=classpath
63+
jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath
64+
javax.inject:javax.inject:1=classpath
65+
net.java.dev.jna:jna-platform:5.6.0=classpath
66+
net.java.dev.jna:jna:5.6.0=classpath
67+
net.sf.jopt-simple:jopt-simple:4.9=classpath
68+
net.sf.kxml:kxml2:2.3.0=classpath
69+
org.apache.commons:commons-compress:1.27.1=classpath
70+
org.apache.commons:commons-lang3:3.16.0=classpath
71+
org.apache.httpcomponents:httpclient:4.5.14=classpath
72+
org.apache.httpcomponents:httpcore:4.4.16=classpath
73+
org.apache.httpcomponents:httpmime:4.5.6=classpath
74+
org.bitbucket.b_c:jose4j:0.9.5=classpath
75+
org.bouncycastle:bcpkix-jdk18on:1.79=classpath
76+
org.bouncycastle:bcprov-jdk18on:1.79=classpath
77+
org.bouncycastle:bcutil-jdk18on:1.79=classpath
78+
org.checkerframework:checker-qual:3.43.0=classpath
79+
org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath
80+
org.glassfish.jaxb:txw2:2.3.2=classpath
81+
org.jdom:jdom2:2.0.6=classpath
82+
org.jetbrains.kotlin.android:org.jetbrains.kotlin.android.gradle.plugin:2.4.0=classpath
83+
org.jetbrains.kotlin:fus-statistics-gradle-plugin:2.4.0=classpath
84+
org.jetbrains.kotlin:kotlin-build-statistics:2.4.0=classpath
85+
org.jetbrains.kotlin:kotlin-build-tools-api:2.4.0=classpath
86+
org.jetbrains.kotlin:kotlin-compiler-runner:2.4.0=classpath
87+
org.jetbrains.kotlin:kotlin-daemon-client:2.4.0=classpath
88+
org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:2.4.0=classpath
89+
org.jetbrains.kotlin:kotlin-gradle-plugin-api:2.4.0=classpath
90+
org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:2.4.0=classpath
91+
org.jetbrains.kotlin:kotlin-gradle-plugin-idea:2.4.0=classpath
92+
org.jetbrains.kotlin:kotlin-gradle-plugin:2.4.0=classpath
93+
org.jetbrains.kotlin:kotlin-gradle-plugins-bom:2.4.0=classpath
94+
org.jetbrains.kotlin:kotlin-klib-commonizer-api:2.4.0=classpath
95+
org.jetbrains.kotlin:kotlin-native-utils:2.4.0=classpath
96+
org.jetbrains.kotlin:kotlin-reflect:2.2.10=classpath
97+
org.jetbrains.kotlin:kotlin-stdlib-common:2.2.10=classpath
98+
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.10=classpath
99+
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.10=classpath
100+
org.jetbrains.kotlin:kotlin-stdlib:2.2.10=classpath
101+
org.jetbrains.kotlin:kotlin-tooling-core:2.4.0=classpath
102+
org.jetbrains.kotlin:kotlin-util-io:2.4.0=classpath
103+
org.jetbrains.kotlin:kotlin-util-klib-metadata:2.4.0=classpath
104+
org.jetbrains.kotlin:kotlin-util-klib:2.4.0=classpath
105+
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.9.0=classpath
106+
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.9.0=classpath
107+
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0=classpath
108+
org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.0=classpath
109+
org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.0=classpath
110+
org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.4.0=classpath
111+
org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0=classpath
112+
org.jetbrains:annotations:23.0.0=classpath
113+
org.jvnet.staxex:stax-ex:1.8.1=classpath
114+
org.ow2.asm:asm-analysis:9.9=classpath
115+
org.ow2.asm:asm-commons:9.9=classpath
116+
org.ow2.asm:asm-tree:9.9=classpath
117+
org.ow2.asm:asm-util:9.9=classpath
118+
org.ow2.asm:asm:9.9=classpath
119+
org.slf4j:slf4j-api:1.7.30=classpath
120+
org.tensorflow:tensorflow-lite-metadata:0.2.0=classpath
121+
empty=
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
22
android.useAndroidX=true
3+
# This builtInKotlin flag was added automatically by Flutter migrator
4+
android.builtInKotlin=false
5+
# This newDsl flag was added automatically by Flutter migrator
6+
android.newDsl=false
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
43
zipStoreBase=GRADLE_USER_HOME
54
zipStorePath=wrapper/dists
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-all.zip

0 commit comments

Comments
 (0)