diff --git a/.github/workflows/gradle-build.yaml b/.github/workflows/gradle-build.yaml index c42648c2..da0d26b6 100644 --- a/.github/workflows/gradle-build.yaml +++ b/.github/workflows/gradle-build.yaml @@ -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: diff --git a/build.gradle b/build.gradle index 435dc3bb..dc9c78c9 100644 --- a/build.gradle +++ b/build.gradle @@ -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' } diff --git a/core/build.gradle b/core/build.gradle index 49f34d8a..584ec061 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -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" } diff --git a/cronet/build.gradle b/cronet/build.gradle index ed6fdba3..ce8026ed 100644 --- a/cronet/build.gradle +++ b/cronet/build.gradle @@ -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" } diff --git a/gradle.properties b/gradle.properties index 5465fec0..dbb7bf70 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ android.enableJetifier=true -android.useAndroidX=true \ No newline at end of file +android.useAndroidX=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0fd600fd..747bfa1a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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