Skip to content

Commit de3abff

Browse files
committed
Upgrades to Java 11, Gradle 8.9, AGP 8.6.1, and Kotlin 1.9.25
1 parent d89407b commit de3abff

File tree

16 files changed

+226
-162
lines changed

16 files changed

+226
-162
lines changed

affectedmoduledetector/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ plugins {
99
apply from: rootProject.file("gradle/jacoco.gradle")
1010

1111
java {
12-
sourceCompatibility = JavaVersion.VERSION_1_8
13-
targetCompatibility = JavaVersion.VERSION_1_8
12+
sourceCompatibility = JavaVersion.VERSION_11
13+
targetCompatibility = JavaVersion.VERSION_11
1414
}
1515

1616
jacoco {
17-
toolVersion = "0.8.8"
17+
toolVersion = "0.8.10"
1818
}
1919

2020
gradlePlugin {

affectedmoduledetector/src/main/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetectorPlugin.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import org.gradle.api.Plugin
88
import org.gradle.api.Project
99
import org.gradle.api.Task
1010
import org.gradle.api.tasks.testing.Test
11-
import org.gradle.internal.impldep.org.jetbrains.annotations.VisibleForTesting
1211
import org.gradle.util.GradleVersion
12+
import org.jetbrains.annotations.VisibleForTesting
1313

1414
/**
1515
* This plugin creates and registers all affected test tasks.

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
buildscript {
3-
ext.kotlin_version = "1.6.20"
3+
ext.kotlin_version = "1.9.25"
44
repositories {
55
google()
66
mavenCentral()
@@ -9,10 +9,10 @@ buildscript {
99
}
1010
}
1111
dependencies {
12-
classpath "com.android.tools.build:gradle:7.3.1"
12+
classpath "com.android.tools.build:gradle:8.6.1"
1313
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
14-
classpath("org.jlleitschuh.gradle:ktlint-gradle:10.2.1")
15-
classpath("org.jacoco:org.jacoco.core:0.8.8")
14+
classpath("org.jlleitschuh.gradle:ktlint-gradle:11.4.2")
15+
classpath("org.jacoco:org.jacoco.core:0.8.10")
1616
classpath "com.vanniktech:gradle-maven-publish-plugin:0.19.0"
1717
}
1818
}

gradle/jacoco.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ project.afterEvaluate {
4747
executionData.setFrom files(coverageData)
4848

4949
reports {
50-
xml.enabled = true
50+
xml.required = true
5151
xml.destination = file("${buildDir}/reports/jacoco/report.xml")
52-
html.enabled = true
52+
html.required = true
5353
}
5454
}
5555

gradle/wrapper/gradle-wrapper.jar

5.36 KB
Binary file not shown.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Thu Oct 15 15:49:37 PDT 2020
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip

0 commit comments

Comments
 (0)