Bump 4.x versions

yschimke · Jul 22, 2023 · fd0f15d · fd0f15d
1 parent 79907b9
commit fd0f15d
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 19 deletions.
diff --git a/android-test/build.gradle b/android-test/build.gradle
@@ -18,9 +18,11 @@ android {
  exclude("META-INF/DEPENDENCIES")
  }
 
+ compileSdk 34
+
  defaultConfig {
- minSdkVersion 21
- targetSdkVersion 33
+ minSdk 21
+ targetSdk 33
  versionCode 1
  versionName "1.0"
 

diff --git a/build.gradle b/build.gradle
@@ -50,7 +50,7 @@ buildscript {
  dependencies {
  classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21"
  classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.10.1"
- classpath "com.android.tools.build:gradle:7.0.4"
+ classpath "com.android.tools.build:gradle:7.4.2"
  }
 
  repositories {
@@ -61,9 +61,9 @@ buildscript {
 }
 
 plugins {
- id "ru.vyarus.animalsniffer" version "1.5.0"
- id "com.github.johnrengelman.shadow" version "5.2.0"
- id "me.champeau.gradle.japicmp" version "0.2.9"
+ id "ru.vyarus.animalsniffer" version "1.7.0"
+ id "com.github.johnrengelman.shadow" version "7.1.2"
+ id "me.champeau.gradle.japicmp" version "0.4.0"
  id "com.diffplug.spotless" version "5.1.2"
  id "net.ltgt.errorprone" version "1.2.1"
 }

diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,4 @@
 org.gradle.jvmargs='-Dfile.encoding=UTF-8'
 android.enableJetifier=true
 android.useAndroidX=true
+android.suppressUnsupportedCompileSdk=34
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Sat Jul 22 11:40:02 BST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/mockwebserver/build.gradle b/mockwebserver/build.gradle
@@ -23,8 +23,8 @@ afterEvaluate { project ->
 }
 
 task japicmp(type: me.champeau.gradle.japicmp.JapicmpTask, dependsOn: 'jar') {
- oldClasspath = files(baselineJar(project, baselineVersion))
- newClasspath = files(jar.archivePath)
+ oldClasspath.from(baselineJar(project, baselineVersion))
+ newClasspath.from(files(jar.archivePath))
  onlyBinaryIncompatibleModified = true
  failOnModification = true
  txtOutputFile = file("$buildDir/reports/japi.txt")

diff --git a/okhttp-logging-interceptor/build.gradle b/okhttp-logging-interceptor/build.gradle
@@ -26,8 +26,8 @@ afterEvaluate { project ->
 }
 
 task japicmp(type: me.champeau.gradle.japicmp.JapicmpTask, dependsOn: 'jar') {
- oldClasspath = files(baselineJar(project, baselineVersion))
- newClasspath = files(jar.archivePath)
+ oldClasspath.from(baselineJar(project, baselineVersion))
+ newClasspath.from(files(jar.archivePath))
  onlyBinaryIncompatibleModified = true
  failOnModification = true
  txtOutputFile = file("$buildDir/reports/japi.txt")

diff --git a/okhttp-sse/build.gradle b/okhttp-sse/build.gradle
@@ -25,8 +25,8 @@ afterEvaluate { project ->
 }
 
 task japicmp(type: me.champeau.gradle.japicmp.JapicmpTask, dependsOn: 'jar') {
- oldClasspath = files(baselineJar(project, baselineVersion))
- newClasspath = files(jar.archivePath)
+ oldClasspath.from(baselineJar(project, baselineVersion))
+ newClasspath.from(files(jar.archivePath))
  onlyBinaryIncompatibleModified = true
  failOnModification = true
  txtOutputFile = file("$buildDir/reports/japi.txt")

diff --git a/okhttp-tls/build.gradle b/okhttp-tls/build.gradle
@@ -25,8 +25,8 @@ afterEvaluate { project ->
 }
 
 task japicmp(type: me.champeau.gradle.japicmp.JapicmpTask, dependsOn: 'jar') {
- oldClasspath = files(baselineJar(project, baselineVersion))
- newClasspath = files(jar.archivePath)
+ oldClasspath.from(baselineJar(project, baselineVersion))
+ newClasspath.from(files(jar.archivePath))
  onlyBinaryIncompatibleModified = true
  failOnModification = true
  txtOutputFile = file("$buildDir/reports/japi.txt")

diff --git a/okhttp-urlconnection/build.gradle b/okhttp-urlconnection/build.gradle
@@ -26,8 +26,8 @@ afterEvaluate { project ->
 }
 
 task japicmp(type: me.champeau.gradle.japicmp.JapicmpTask, dependsOn: 'jar') {
- oldClasspath = files(baselineJar(project, baselineVersion))
- newClasspath = files(jar.archivePath)
+ oldClasspath.from(baselineJar(project, baselineVersion))
+ newClasspath.from(files(jar.archivePath))
  onlyBinaryIncompatibleModified = true
  failOnModification = true
  txtOutputFile = file("$buildDir/reports/japi.txt")

diff --git a/okhttp/build.gradle b/okhttp/build.gradle
@@ -55,8 +55,8 @@ afterEvaluate { project ->
 }
 
 task japicmp(type: me.champeau.gradle.japicmp.JapicmpTask, dependsOn: 'jar') {
- oldClasspath = files(baselineJar(project, baselineVersion))
- newClasspath = files(jar.archivePath)
+ oldClasspath.from(baselineJar(project, baselineVersion))
+ newClasspath.from(files(jar.archivePath))
  onlyBinaryIncompatibleModified = true
  failOnModification = true
  txtOutputFile = file("$buildDir/reports/japi.txt")