Skip to content

Commit 91565f7

Browse files
yschimkeyschimke
authored
Bump 4.x dependency versions (#7947)
1 parent 0aa953b commit 91565f7

File tree

11 files changed

+49
-46
lines changed

11 files changed

+49
-46
lines changed

‎android-test/build.gradle

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ android {
1818
exclude("META-INF/DEPENDENCIES")
1919
}
2020

21-
compileSdkVersion 29
21+
compileSdk 34
2222

2323
defaultConfig {
24-
minSdkVersion 21
25-
targetSdkVersion 29
24+
minSdk 21
25+
targetSdk 33
2626
versionCode 1
2727
versionName "1.0"
2828

@@ -34,24 +34,24 @@ android {
3434
dependencies {
3535
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}"
3636
implementation "org.jetbrains.kotlin:kotlin-reflect:${versions.kotlin}"
37-
implementation 'com.google.android.gms:play-services-safetynet:17.0.0'
37+
implementation 'com.google.android.gms:play-services-safetynet:18.0.1'
3838
implementation project(':okhttp')
39-
testImplementation 'junit:junit:4.13'
39+
testImplementation 'junit:junit:4.13.2'
4040
androidTestImplementation(project(':okhttp-testing-support')) {
4141
exclude group: 'org.openjsse', module: 'openjsse'
4242
exclude group: 'org.conscrypt', module: 'conscrypt-openjdk-uber'
4343
exclude group: 'software.amazon.cryptools', module: 'AmazonCorrettoCryptoProvider'
4444
}
45-
androidTestImplementation "org.bouncycastle:bcprov-jdk15on:${versions.bouncycastle}"
46-
androidTestImplementation "org.bouncycastle:bctls-jdk15on:${versions.bouncycastle}"
47-
androidTestImplementation "org.conscrypt:conscrypt-android:2.5.0"
45+
androidTestImplementation "org.bouncycastle:bcprov-jdk15to18:${versions.bouncycastle}"
46+
androidTestImplementation "org.bouncycastle:bctls-jdk15to18:${versions.bouncycastle}"
47+
androidTestImplementation "org.conscrypt:conscrypt-android:2.5.2"
4848
androidTestImplementation project(':mockwebserver')
4949
androidTestImplementation project(':okhttp-tls')
5050
androidTestImplementation project(':okhttp-dnsoverhttps')
5151
androidTestImplementation project(':okhttp-logging-interceptor')
52-
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
53-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
54-
androidTestImplementation 'org.apache.httpcomponents.client5:httpclient5:5.0'
55-
androidTestImplementation 'com.squareup.moshi:moshi:1.9.2'
56-
androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.9.2'
52+
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
53+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
54+
androidTestImplementation 'org.apache.httpcomponents.client5:httpclient5:5.2.1'
55+
androidTestImplementation 'com.squareup.moshi:moshi:1.15.0'
56+
androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.15.0'
5757
}

‎build.gradle

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,35 @@ import net.ltgt.gradle.errorprone.CheckSeverity
22

33
buildscript {
44
ext.versions = [
5-
'animalSniffer': '1.18',
6-
'assertj': '3.15.0',
7-
'bouncycastle': '1.65',
5+
'animalSniffer': '1.23',
6+
'assertj': '3.24.2',
7+
'bouncycastle': '1.73',
88
'brotli': '0.1.2',
99
'checkstyle': '8.28',
1010
'conscrypt': '2.5.2',
11-
'corretto': '1.3.1',
11+
'corretto': '2.1.0',
1212
'findbugs': '3.0.2',
13-
'guava': '31.1-jre',
13+
'guava': '32.1.1-jre',
1414
'java': '1.8',
15-
'jnrUnixsocket': '0.28',
16-
'jsoup': '1.13.1',
17-
'junit': '4.13',
18-
'kotlin': '1.6.20',
19-
'moshi': '1.13.0',
20-
'okio': '3.2.0',
15+
'jnrUnixsocket': '0.38.20',
16+
'jsoup': '1.16.1',
17+
'junit': '4.13.2',
18+
'kotlin': '1.8.21',
19+
'moshi': '1.15.0',
20+
'okio': '3.4.0',
2121
'ktlint': '0.38.0',
2222
'picocli': '4.2.0',
23-
'openjsse': '1.1.0'
23+
'openjsse': '1.1.12'
2424
]
2525

2626
ext.deps = [
2727
'picocli': "info.picocli:picocli:${versions.picocli}",
2828
'android': "org.robolectric:android-all:12.1-robolectric-8229987",
2929
'animalSniffer': "org.codehaus.mojo:animal-sniffer-annotations:${versions.animalSniffer}",
3030
'assertj': "org.assertj:assertj-core:${versions.assertj}",
31-
'bouncycastle': "org.bouncycastle:bcprov-jdk15on:${versions.bouncycastle}",
32-
'bouncycastlepkix': "org.bouncycastle:bcpkix-jdk15on:${versions.bouncycastle}",
33-
'bouncycastletls': "org.bouncycastle:bctls-jdk15on:${versions.bouncycastle}",
31+
'bouncycastle': "org.bouncycastle:bcprov-jdk15to18:${versions.bouncycastle}",
32+
'bouncycastlepkix': "org.bouncycastle:bcpkix-jdk15to18:${versions.bouncycastle}",
33+
'bouncycastletls': "org.bouncycastle:bctls-jdk15to18:${versions.bouncycastle}",
3434
'brotli': "org.brotli:dec:${versions.brotli}",
3535
'conscrypt': "org.conscrypt:conscrypt-openjdk-uber:${versions.conscrypt}",
3636
'corretto': "software.amazon.cryptools:AmazonCorrettoCryptoProvider:${versions.corretto}:linux-x86_64",
@@ -48,9 +48,9 @@ buildscript {
4848
]
4949

5050
dependencies {
51-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10"
51+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21"
5252
classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.10.1"
53-
classpath "com.android.tools.build:gradle:7.0.4"
53+
classpath "com.android.tools.build:gradle:7.4.2"
5454
}
5555

5656
repositories {
@@ -61,9 +61,9 @@ buildscript {
6161
}
6262

6363
plugins {
64-
id "ru.vyarus.animalsniffer" version "1.5.0"
65-
id "com.github.johnrengelman.shadow" version "5.2.0"
66-
id "me.champeau.gradle.japicmp" version "0.2.9"
64+
id "ru.vyarus.animalsniffer" version "1.7.1"
65+
id "com.github.johnrengelman.shadow" version "7.1.2"
66+
id "me.champeau.gradle.japicmp" version "0.4.0"
6767
id "com.diffplug.spotless" version "5.1.2"
6868
id "net.ltgt.errorprone" version "1.2.1"
6969
}

‎gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
org.gradle.jvmargs='-Dfile.encoding=UTF-8'
22
android.enableJetifier=true
33
android.useAndroidX=true
4+
android.suppressUnsupportedCompileSdk=34

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
#Sat Jul 22 11:40:02 BST 2023
12
distributionBase=GRADLE_USER_HOME
23
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists

‎mockwebserver/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ afterEvaluate { project ->
2323
}
2424

2525
task japicmp(type: me.champeau.gradle.japicmp.JapicmpTask, dependsOn: 'jar') {
26-
oldClasspath = files(baselineJar(project, baselineVersion))
27-
newClasspath = files(jar.archivePath)
26+
oldClasspath.from(baselineJar(project, baselineVersion))
27+
newClasspath.from(files(jar.archivePath))
2828
onlyBinaryIncompatibleModified = true
2929
failOnModification = true
3030
txtOutputFile = file("$buildDir/reports/japi.txt")

‎okhttp-logging-interceptor/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ afterEvaluate { project ->
2626
}
2727

2828
task japicmp(type: me.champeau.gradle.japicmp.JapicmpTask, dependsOn: 'jar') {
29-
oldClasspath = files(baselineJar(project, baselineVersion))
30-
newClasspath = files(jar.archivePath)
29+
oldClasspath.from(baselineJar(project, baselineVersion))
30+
newClasspath.from(files(jar.archivePath))
3131
onlyBinaryIncompatibleModified = true
3232
failOnModification = true
3333
txtOutputFile = file("$buildDir/reports/japi.txt")

‎okhttp-sse/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ afterEvaluate { project ->
2525
}
2626

2727
task japicmp(type: me.champeau.gradle.japicmp.JapicmpTask, dependsOn: 'jar') {
28-
oldClasspath = files(baselineJar(project, baselineVersion))
29-
newClasspath = files(jar.archivePath)
28+
oldClasspath.from(baselineJar(project, baselineVersion))
29+
newClasspath.from(files(jar.archivePath))
3030
onlyBinaryIncompatibleModified = true
3131
failOnModification = true
3232
txtOutputFile = file("$buildDir/reports/japi.txt")

‎okhttp-tls/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ afterEvaluate { project ->
2525
}
2626

2727
task japicmp(type: me.champeau.gradle.japicmp.JapicmpTask, dependsOn: 'jar') {
28-
oldClasspath = files(baselineJar(project, baselineVersion))
29-
newClasspath = files(jar.archivePath)
28+
oldClasspath.from(baselineJar(project, baselineVersion))
29+
newClasspath.from(files(jar.archivePath))
3030
onlyBinaryIncompatibleModified = true
3131
failOnModification = true
3232
txtOutputFile = file("$buildDir/reports/japi.txt")

‎okhttp-urlconnection/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ afterEvaluate { project ->
2626
}
2727

2828
task japicmp(type: me.champeau.gradle.japicmp.JapicmpTask, dependsOn: 'jar') {
29-
oldClasspath = files(baselineJar(project, baselineVersion))
30-
newClasspath = files(jar.archivePath)
29+
oldClasspath.from(baselineJar(project, baselineVersion))
30+
newClasspath.from(files(jar.archivePath))
3131
onlyBinaryIncompatibleModified = true
3232
failOnModification = true
3333
txtOutputFile = file("$buildDir/reports/japi.txt")

‎okhttp/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ afterEvaluate { project ->
5555
}
5656

5757
task japicmp(type: me.champeau.gradle.japicmp.JapicmpTask, dependsOn: 'jar') {
58-
oldClasspath = files(baselineJar(project, baselineVersion))
59-
newClasspath = files(jar.archivePath)
58+
oldClasspath.from(baselineJar(project, baselineVersion))
59+
newClasspath.from(files(jar.archivePath))
6060
onlyBinaryIncompatibleModified = true
6161
failOnModification = true
6262
txtOutputFile = file("$buildDir/reports/japi.txt")

‎okhttp/src/main/kotlin/okhttp3/internal/platform/android/AndroidCertificateChainCleaner.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import okhttp3.internal.tls.CertificateChainCleaner
3030
* Not used if X509TrustManager doesn't implement [X509TrustManager.checkServerTrusted] with
3131
* an additional host param.
3232
*/
33+
@SuppressSignatureCheck
3334
internal class AndroidCertificateChainCleaner(
3435
private val trustManager: X509TrustManager,
3536
private val x509TrustManagerExtensions: X509TrustManagerExtensions

0 commit comments

Comments
 (0)