Skip to content

Commit f463957

Browse files
devPalacioJay Palacio
devPalacio
and
Jay Palacio
authored
Make project config cache compatible (#486)
Co-authored-by: Jay Palacio <jpalacio@dropbox.com>
1 parent 4960858 commit f463957

File tree

15 files changed

+276
-399
lines changed

15 files changed

+276
-399
lines changed

‎build.gradle‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -21,33 +21,6 @@ plugins {
2121
alias(dropboxJavaSdkLibs.plugins.binary.compatibility.validator) apply false
2222
}
2323

24-
allprojects {
25-
repositories {
26-
google()
27-
mavenCentral()
28-
}
29-
30-
plugins.withId("com.vanniktech.maven.publish") {
31-
mavenPublish {
32-
sonatypeHost = "S01"
33-
}
34-
}
35-
}
36-
37-
3824
dependencyGuard {
3925
configuration("classpath")
4026
}
41-
42-
// configure SDK to use the generated_stone_source output directory so we can track changes in Git
43-
def sdkProject = findProject(':dropbox-sdk-java')
44-
sdkProject.configure(sdkProject) {
45-
afterEvaluate {
46-
generateStone {
47-
outputDir "${project.projectDir}/generated_stone_source/main"
48-
}
49-
generateTestStone {
50-
outputDir "${project.projectDir}/generated_stone_source/test"
51-
}
52-
}
53-
}

‎dependencies/classpath.txt‎

Lines changed: 85 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,73 @@
1-
androidx.databinding:databinding-common:7.2.2
2-
androidx.databinding:databinding-compiler-common:7.2.2
1+
androidx.databinding:databinding-common:7.4.2
2+
androidx.databinding:databinding-compiler-common:7.4.2
33
biz.aQute.bnd:biz.aQute.bndlib:5.2.0
4-
com.android.databinding:baseLibrary:7.2.2
5-
com.android.tools.analytics-library:crash:30.2.2
6-
com.android.tools.analytics-library:protos:30.2.2
7-
com.android.tools.analytics-library:shared:30.2.2
8-
com.android.tools.analytics-library:tracker:30.2.2
9-
com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09
10-
com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09
11-
com.android.tools.build:aapt2-proto:7.2.2-7984345
12-
com.android.tools.build:aaptcompiler:7.2.2
13-
com.android.tools.build:apksig:7.2.2
14-
com.android.tools.build:apkzlib:7.2.2
15-
com.android.tools.build:builder-model:7.2.2
16-
com.android.tools.build:builder-test-api:7.2.2
17-
com.android.tools.build:builder:7.2.2
18-
com.android.tools.build:bundletool:1.8.2
19-
com.android.tools.build:gradle-api:7.2.2
20-
com.android.tools.build:gradle:7.2.2
21-
com.android.tools.build:manifest-merger:30.2.2
4+
com.android.databinding:baseLibrary:7.4.2
5+
com.android.tools.analytics-library:crash:30.4.2
6+
com.android.tools.analytics-library:protos:30.4.2
7+
com.android.tools.analytics-library:shared:30.4.2
8+
com.android.tools.analytics-library:tracker:30.4.2
9+
com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10
10+
com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10
11+
com.android.tools.build:aapt2-proto:7.4.2-8841542
12+
com.android.tools.build:aaptcompiler:7.4.2
13+
com.android.tools.build:apksig:7.4.2
14+
com.android.tools.build:apkzlib:7.4.2
15+
com.android.tools.build:builder-model:7.4.2
16+
com.android.tools.build:builder-test-api:7.4.2
17+
com.android.tools.build:builder:7.4.2
18+
com.android.tools.build:bundletool:1.11.4
19+
com.android.tools.build:gradle-api:7.4.2
20+
com.android.tools.build:gradle-settings-api:7.4.2
21+
com.android.tools.build:gradle:7.4.2
22+
com.android.tools.build:manifest-merger:30.4.2
2223
com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api
23-
com.android.tools.ddms:ddmlib:30.2.2
24-
com.android.tools.layoutlib:layoutlib-api:30.2.2
25-
com.android.tools.lint:lint-model:30.2.2
26-
com.android.tools.lint:lint-typedef-remover:30.2.2
27-
com.android.tools.utp:android-device-provider-ddmlib-proto:30.2.2
28-
com.android.tools.utp:android-device-provider-gradle-proto:30.2.2
29-
com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.2.2
30-
com.android.tools.utp:android-test-plugin-host-coverage-proto:30.2.2
31-
com.android.tools.utp:android-test-plugin-host-retention-proto:30.2.2
32-
com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.2.2
33-
com.android.tools:annotations:30.2.2
34-
com.android.tools:common:30.2.2
35-
com.android.tools:dvlib:30.2.2
36-
com.android.tools:repository:30.2.2
37-
com.android.tools:sdk-common:30.2.2
38-
com.android.tools:sdklib:30.2.2
39-
com.android:signflinger:7.2.2
40-
com.android:zipflinger:7.2.2
41-
com.dropbox.dependency-guard:com.dropbox.dependency-guard.gradle.plugin:0.4.0
42-
com.dropbox.dependency-guard:dependency-guard:0.4.0
43-
com.fasterxml.jackson.core:jackson-annotations:2.11.1
44-
com.fasterxml.jackson.core:jackson-core:2.11.1
45-
com.fasterxml.jackson.core:jackson-databind:2.11.1
46-
com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.11.1
47-
com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.11.1
48-
com.fasterxml.jackson.module:jackson-module-kotlin:2.11.1
49-
com.fasterxml.woodstox:woodstox-core:6.2.1
24+
com.android.tools.ddms:ddmlib:30.4.2
25+
com.android.tools.layoutlib:layoutlib-api:30.4.2
26+
com.android.tools.lint:lint-model:30.4.2
27+
com.android.tools.lint:lint-typedef-remover:30.4.2
28+
com.android.tools.utp:android-device-provider-ddmlib-proto:30.4.2
29+
com.android.tools.utp:android-device-provider-gradle-proto:30.4.2
30+
com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.4.2
31+
com.android.tools.utp:android-test-plugin-host-coverage-proto:30.4.2
32+
com.android.tools.utp:android-test-plugin-host-retention-proto:30.4.2
33+
com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.4.2
34+
com.android.tools:annotations:30.4.2
35+
com.android.tools:common:30.4.2
36+
com.android.tools:dvlib:30.4.2
37+
com.android.tools:repository:30.4.2
38+
com.android.tools:sdk-common:30.4.2
39+
com.android.tools:sdklib:30.4.2
40+
com.android:signflinger:7.4.2
41+
com.android:zipflinger:7.4.2
42+
com.dropbox.dependency-guard:com.dropbox.dependency-guard.gradle.plugin:0.4.3
43+
com.dropbox.dependency-guard:dependency-guard:0.4.3
5044
com.github.ben-manes.versions:com.github.ben-manes.versions.gradle.plugin:0.42.0
5145
com.github.ben-manes:gradle-versions-plugin:0.42.0
5246
com.github.blindpirate.osgi:com.github.blindpirate.osgi.gradle.plugin:0.0.6
5347
com.github.gundy:semver4j:0.16.4
5448
com.google.android:annotations:4.1.1.4
55-
com.google.api.grpc:proto-google-common-protos:1.12.0
49+
com.google.api.grpc:proto-google-common-protos:2.0.1
5650
com.google.auto.value:auto-value-annotations:1.6.2
5751
com.google.code.findbugs:jsr305:3.0.2
5852
com.google.code.gson:gson:2.8.9
5953
com.google.crypto.tink:tink:1.3.0-rc2
6054
com.google.dagger:dagger:2.28.3
61-
com.google.errorprone:error_prone_annotations:2.3.4
55+
com.google.errorprone:error_prone_annotations:2.4.0
6256
com.google.flatbuffers:flatbuffers-java:1.12.0
6357
com.google.guava:failureaccess:1.0.1
6458
com.google.guava:guava:30.1-jre
6559
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
6660
com.google.j2objc:j2objc-annotations:1.3
6761
com.google.jimfs:jimfs:1.1
68-
com.google.protobuf:protobuf-java-util:3.10.0
69-
com.google.protobuf:protobuf-java:3.10.0
70-
com.google.testing.platform:core-proto:0.0.8-alpha07
62+
com.google.protobuf:protobuf-java-util:3.17.2
63+
com.google.protobuf:protobuf-java:3.17.2
64+
com.google.testing.platform:core-proto:0.0.8-alpha08
7165
com.googlecode.java-diff-utils:diffutils:1.3.0
72-
com.googlecode.json-simple:json-simple:1.1
7366
com.googlecode.juniversalchardet:juniversalchardet:1.0.3
74-
com.squareup.moshi:moshi:1.12.0
75-
com.squareup.okhttp3:okhttp:3.14.9
76-
com.squareup.okio:okio:2.10.0
67+
com.squareup.moshi:moshi:1.14.0
68+
com.squareup.okhttp3:okhttp:4.10.0
69+
com.squareup.okio:okio-jvm:3.0.0
70+
com.squareup.okio:okio:3.0.0
7771
com.squareup.retrofit2:converter-moshi:2.9.0
7872
com.squareup.retrofit2:retrofit:2.9.0
7973
com.squareup:javapoet:1.10.0
@@ -82,55 +76,53 @@ com.sun.activation:javax.activation:1.2.0
8276
com.sun.istack:istack-commons-runtime:3.0.8
8377
com.sun.xml.fastinfoset:FastInfoset:1.2.16
8478
com.thoughtworks.xstream:xstream:1.4.17
85-
com.vanniktech.maven.publish:com.vanniktech.maven.publish.gradle.plugin:0.18.0
86-
com.vanniktech:gradle-maven-publish-plugin:0.18.0
79+
com.vanniktech.maven.publish:com.vanniktech.maven.publish.gradle.plugin:0.23.2
80+
com.vanniktech:gradle-maven-publish-plugin:0.23.2
81+
com.vanniktech:nexus:0.23.2
8782
commons-codec:commons-codec:1.11
8883
commons-io:commons-io:2.4
8984
commons-logging:commons-logging:1.2
9085
de.undercouch:gradle-download-task:4.1.1
9186
gradle.plugin.com.github.blindpirate:gradle-legacy-osgi-plugin:0.0.6
9287
io.github.x-stream:mxparser:1.2.1
93-
io.grpc:grpc-api:1.21.1
94-
io.grpc:grpc-context:1.21.1
95-
io.grpc:grpc-core:1.21.1
96-
io.grpc:grpc-netty:1.21.1
97-
io.grpc:grpc-protobuf-lite:1.21.1
98-
io.grpc:grpc-protobuf:1.21.1
99-
io.grpc:grpc-stub:1.21.1
100-
io.netty:netty-buffer:4.1.34.Final
101-
io.netty:netty-codec-http2:4.1.34.Final
102-
io.netty:netty-codec-http:4.1.34.Final
103-
io.netty:netty-codec-socks:4.1.34.Final
104-
io.netty:netty-codec:4.1.34.Final
105-
io.netty:netty-common:4.1.34.Final
106-
io.netty:netty-handler-proxy:4.1.34.Final
107-
io.netty:netty-handler:4.1.34.Final
108-
io.netty:netty-resolver:4.1.34.Final
109-
io.netty:netty-transport:4.1.34.Final
110-
io.opencensus:opencensus-api:0.21.0
111-
io.opencensus:opencensus-contrib-grpc-metrics:0.21.0
112-
it.unimi.dsi:fastutil:8.4.0
88+
io.grpc:grpc-api:1.39.0
89+
io.grpc:grpc-context:1.39.0
90+
io.grpc:grpc-core:1.39.0
91+
io.grpc:grpc-netty:1.39.0
92+
io.grpc:grpc-protobuf-lite:1.39.0
93+
io.grpc:grpc-protobuf:1.39.0
94+
io.grpc:grpc-stub:1.39.0
95+
io.netty:netty-buffer:4.1.52.Final
96+
io.netty:netty-codec-http2:4.1.52.Final
97+
io.netty:netty-codec-http:4.1.52.Final
98+
io.netty:netty-codec-socks:4.1.52.Final
99+
io.netty:netty-codec:4.1.52.Final
100+
io.netty:netty-common:4.1.52.Final
101+
io.netty:netty-handler-proxy:4.1.52.Final
102+
io.netty:netty-handler:4.1.52.Final
103+
io.netty:netty-resolver:4.1.52.Final
104+
io.netty:netty-transport:4.1.52.Final
105+
io.perfmark:perfmark-api:0.23.0
113106
jakarta.activation:jakarta.activation-api:1.2.1
114107
jakarta.xml.bind:jakarta.xml.bind-api:2.3.2
108+
javax.annotation:javax.annotation-api:1.3.2
115109
javax.inject:javax.inject:1
116110
net.java.dev.jna:jna-platform:5.6.0
117111
net.java.dev.jna:jna:5.6.0
118112
net.sf.jopt-simple:jopt-simple:4.9
119113
net.sf.kxml:kxml2:2.3.0
120114
org.apache.commons:commons-compress:1.20
121-
org.apache.httpcomponents:httpclient:4.5.9
122-
org.apache.httpcomponents:httpcore:4.4.11
115+
org.apache.httpcomponents:httpclient:4.5.13
116+
org.apache.httpcomponents:httpcore:4.4.13
123117
org.apache.httpcomponents:httpmime:4.5.6
124118
org.bitbucket.b_c:jose4j:0.7.0
125-
org.bouncycastle:bcpkix-jdk15on:1.56
126-
org.bouncycastle:bcprov-jdk15on:1.56
119+
org.bouncycastle:bcpkix-jdk15on:1.67
120+
org.bouncycastle:bcprov-jdk15on:1.67
127121
org.checkerframework:checker-qual:3.5.0
128-
org.codehaus.mojo:animal-sniffer-annotations:1.17
129-
org.codehaus.woodstox:stax2-api:4.2.1
122+
org.codehaus.mojo:animal-sniffer-annotations:1.19
130123
org.glassfish.jaxb:jaxb-runtime:2.3.2
131124
org.glassfish.jaxb:txw2:2.3.2
132125
org.jdom:jdom2:2.0.6
133-
org.jetbrains.dokka:dokka-core:1.4.32
134126
org.jetbrains.intellij.deps:trove4j:1.0.20200330
135127
org.jetbrains.kotlin:kotlin-android-extensions:1.6.21
136128
org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.6.21
@@ -145,33 +137,29 @@ org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21
145137
org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.6.21
146138
org.jetbrains.kotlin:kotlin-native-utils:1.6.21
147139
org.jetbrains.kotlin:kotlin-project-model:1.6.21
148-
org.jetbrains.kotlin:kotlin-reflect:1.5.31
140+
org.jetbrains.kotlin:kotlin-reflect:1.7.10
149141
org.jetbrains.kotlin:kotlin-scripting-common:1.6.21
150142
org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.6.21
151143
org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.6.21
152144
org.jetbrains.kotlin:kotlin-scripting-jvm:1.6.21
153-
org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31
154-
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31
155-
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31
156-
org.jetbrains.kotlin:kotlin-stdlib:1.5.31
145+
org.jetbrains.kotlin:kotlin-stdlib-common:1.8.0
146+
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0
147+
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0
148+
org.jetbrains.kotlin:kotlin-stdlib:1.8.0
157149
org.jetbrains.kotlin:kotlin-tooling-metadata:1.6.21
158150
org.jetbrains.kotlin:kotlin-util-io:1.6.21
159151
org.jetbrains.kotlin:kotlin-util-klib:1.6.21
160152
org.jetbrains.kotlinx.binary-compatibility-validator:org.jetbrains.kotlinx.binary-compatibility-validator.gradle.plugin:0.11.1
161153
org.jetbrains.kotlinx:binary-compatibility-validator:0.11.1
162154
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0
163-
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1
164155
org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.5.0
165156
org.jetbrains:annotations:13.0
166-
org.jetbrains:markdown-jvm:0.2.1
167-
org.jetbrains:markdown:0.2.1
168157
org.json:json:20180813
169-
org.jsoup:jsoup:1.13.1
170158
org.jvnet.staxex:stax-ex:1.8.1
171-
org.ow2.asm:asm-analysis:9.1
172-
org.ow2.asm:asm-commons:9.1
159+
org.ow2.asm:asm-analysis:9.2
160+
org.ow2.asm:asm-commons:9.2
173161
org.ow2.asm:asm-tree:9.2
174-
org.ow2.asm:asm-util:9.1
162+
org.ow2.asm:asm-util:9.2
175163
org.ow2.asm:asm:9.2
176164
org.slf4j:slf4j-api:1.7.30
177165
org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2

0 commit comments

Comments
 (0)