Skip to content

Commit

Permalink
Bump some build dependencies to enable building with a newer JDK. (#459)
Browse files Browse the repository at this point in the history
This is enough to get Google's JDK11 to build Volley. While newer versions of some dependencies are available, taking these would bring other complexity to the build.
  • Loading branch information
jpd236 authored Nov 29, 2023
1 parent a4b92e0 commit cda470c
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 8 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/gradle-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
java-version: 1.8
distribution: 'zulu'
java-version: '11'
- name: Cache Gradle packages
uses: actions/cache@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.2'
classpath 'com.android.tools.build:gradle:7.4.1'
classpath 'gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.9'
classpath 'net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:2.0.2'
}
Expand Down
2 changes: 1 addition & 1 deletion core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies {
testImplementation "junit:junit:4.12"
testImplementation "org.hamcrest:hamcrest-library:1.3"
testImplementation "org.mockito:mockito-core:2.19.0"
testImplementation "org.robolectric:robolectric:3.4.2"
testImplementation "org.robolectric:robolectric:4.8.2"
// TODO(#424): Fix this dependency at the library level.
testImplementation "androidx.annotation:annotation:1.0.1"
}
Expand Down
2 changes: 1 addition & 1 deletion cronet/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies {
testImplementation "org.chromium.net:cronet-embedded:76.3809.111"
testImplementation "junit:junit:4.12"
testImplementation "org.mockito:mockito-core:2.19.0"
testImplementation "org.robolectric:robolectric:3.4.2"
testImplementation "org.robolectric:robolectric:4.8.2"
// TODO(#424): Fix this dependency at the library level.
testImplementation "androidx.annotation:annotation:1.0.1"
}
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
android.enableJetifier=true
android.useAndroidX=true
android.useAndroidX=true
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip

0 comments on commit cda470c

Please sign in to comment.