Skip to content

Commit 98a3241

Browse files
committed
downgrade to Gradle 8 (8.1 isn't supported on GitHub actions by default)
1 parent 3418e03 commit 98a3241

File tree

6 files changed

+12
-10
lines changed

6 files changed

+12
-10
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent.*
55

66
plugins {
77
base
8-
// id("org.jetbrains.kotlin.plugin.assignment")
98
}
109

1110
// common config for all projects
@@ -22,7 +21,7 @@ tasks.withType<AbstractArchiveTask>().configureEach {
2221
}
2322

2423
tasks.withType<AbstractTestTask>().configureEach {
25-
timeout = Duration.ofMinutes(60)
24+
timeout.set(Duration.ofMinutes(60))
2625

2726
testLogging {
2827
showCauses = true

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 = JavaLanguageVersion.of(11)
16+
languageVersion.set(JavaLanguageVersion.of(11))
1717
}
1818
withSourcesJar()
1919
}
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-snapshots/gradle-8.1-20230224233012+0000-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

gradlew

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,6 @@ done
8585
APP_BASE_NAME=${0##*/}
8686
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
8787

88-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
89-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
90-
9188
# Use the maximum available, or set MAX_FD != -1 to use that value.
9289
MAX_FD=maximum
9390

@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
197194
done
198195
fi
199196

197+
198+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
199+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
200+
200201
# Collect all arguments for the java command;
201202
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
202203
# shell script including quotes and variable substitutions, so put them in

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
import buildsrc.utils.configurationNames
12
import buildsrc.utils.skipTestFixturesPublications
3+
import org.gradle.api.attributes.plugin.GradlePluginApiVersion.GRADLE_PLUGIN_API_VERSION_ATTRIBUTE
24

35
plugins {
46
buildsrc.conventions.`kotlin-gradle-plugin`
@@ -26,8 +28,8 @@ dependencies {
2628

2729
@Suppress("UnstableApiUsage")
2830
gradlePlugin {
29-
website = "https://github.com/Kotlin/binary-compatibility-validator-alternative"
30-
vcsUrl = "https://github.com/adamko-dev/binary-compatibility-validator-alternative"
31+
website.set("https://github.com/Kotlin/binary-compatibility-validator-alternative")
32+
vcsUrl.set("https://github.com/adamko-dev/binary-compatibility-validator-alternative")
3133
isAutomatedPublishing = true
3234

3335
plugins.configureEach {

settings.gradle.kts

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

1010
@Suppress("UnstableApiUsage")
1111
dependencyResolutionManagement {
12-
repositoriesMode = RepositoriesMode.PREFER_SETTINGS
12+
repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS)
1313

1414
repositories {
1515
mavenCentral()

0 commit comments

Comments
 (0)