Skip to content

Commit 334ac4c

Browse files
authored
update Gradle to 8.1.1 (#8)
* update Gradle to 8.1.1 Start using the assignment-plugin magic for Providers and Properties * tidy up repos (Maven Central first because it's more reliable than Gradle)
1 parent 45dfc68 commit 334ac4c

File tree

11 files changed

+16
-20
lines changed

11 files changed

+16
-20
lines changed

build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ version = "0.0.5-SNAPSHOT"
1010

1111
idea {
1212
module {
13-
isDownloadSources = true
14-
isDownloadJavadoc = false
1513
excludeGeneratedGradleDsl(layout)
1614
excludeDirs = excludeDirs + layout.files(
1715
".idea",

buildSrc/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ dependencies {
1414

1515
java {
1616
toolchain {
17-
languageVersion.set(JavaLanguageVersion.of(11))
17+
languageVersion = JavaLanguageVersion.of(11)
1818
}
1919
}

buildSrc/settings.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ rootProject.name = "buildSrc"
22

33
pluginManagement {
44
repositories {
5-
gradlePluginPortal()
65
mavenCentral()
6+
gradlePluginPortal()
77
}
88
}
99

1010
@Suppress("UnstableApiUsage")
1111
dependencyResolutionManagement {
1212

13-
repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS)
13+
repositoriesMode = RepositoriesMode.PREFER_SETTINGS
1414

1515
repositories {
1616
mavenCentral()

buildSrc/src/main/kotlin/buildsrc/conventions/java-base.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ plugins {
1313

1414
extensions.getByType<JavaPluginExtension>().apply {
1515
toolchain {
16-
languageVersion.set(JavaLanguageVersion.of(11))
16+
languageVersion = JavaLanguageVersion.of(11)
1717
}
1818
withSourcesJar()
1919
}

buildSrc/src/main/kotlin/buildsrc/conventions/kotlin-gradle-plugin.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99
}
1010

1111
tasks.validatePlugins {
12-
enableStricterValidation.set(true)
12+
enableStricterValidation = true
1313
}
1414

1515
sourceSets {

gradle/wrapper/gradle-wrapper.jar

34 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

gradlew

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,15 +144,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144144
case $MAX_FD in #(
145145
max*)
146146
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
147-
# shellcheck disable=SC3045
147+
# shellcheck disable=SC3045
148148
MAX_FD=$( ulimit -H -n ) ||
149149
warn "Could not query maximum file descriptor limit"
150150
esac
151151
case $MAX_FD in #(
152152
'' | soft) :;; #(
153153
*)
154154
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
155-
# shellcheck disable=SC3045
155+
# shellcheck disable=SC3045
156156
ulimit -n "$MAX_FD" ||
157157
warn "Could not set maximum file descriptor limit to $MAX_FD"
158158
esac

modules/bcv-gradle-plugin/build.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import buildsrc.utils.configurationNames
22
import buildsrc.utils.skipTestFixturesPublications
33
import org.gradle.api.attributes.plugin.GradlePluginApiVersion.GRADLE_PLUGIN_API_VERSION_ATTRIBUTE
4-
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
4+
import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
55

66
plugins {
77
buildsrc.conventions.`kotlin-gradle-plugin`
@@ -32,8 +32,8 @@ dependencies {
3232

3333
@Suppress("UnstableApiUsage")
3434
gradlePlugin {
35-
website.set("https://github.com/adamko-dev/kotlin-binary-compatibility-validator-mu")
36-
vcsUrl.set("https://github.com/adamko-dev/kotlin-binary-compatibility-validator-mu")
35+
website = "https://github.com/adamko-dev/kotlin-binary-compatibility-validator-mu"
36+
vcsUrl = "https://github.com/adamko-dev/kotlin-binary-compatibility-validator-mu"
3737
isAutomatedPublishing = true
3838

3939
plugins.configureEach {
@@ -91,9 +91,9 @@ skipTestFixturesPublications()
9191
// archiveClassifier.set("")
9292
//}
9393

94-
tasks.withType<KotlinCompile>().configureEach {
95-
kotlinOptions {
96-
freeCompilerArgs += listOf(
94+
tasks.withType<KotlinCompilationTask<*>>().configureEach {
95+
compilerOptions {
96+
freeCompilerArgs.addAll(
9797
"-opt-in=dev.adamko.kotlin.binary_compatibility_validator.internal.BCVInternalApi"
9898
)
9999
}

modules/bcv-gradle-plugin/src/main/kotlin/tasks/BCVApiGenerateTask.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ constructor(
9797
this@worker.ignoredPackages.set(target.ignoredPackages)
9898
this@worker.ignoredMarkers.set(target.ignoredMarkers)
9999
this@worker.ignoredClasses.set(target.ignoredClasses)
100-
101100
}
102101
}
103102
}

0 commit comments

Comments
 (0)