Skip to content

Commit

Permalink
Upgradle to 5.0-rc-1
Browse files Browse the repository at this point in the history
 - Update Gradle wrapper
 - Upgrade build-scan plugin to minimum required version and make
   required changes to build script
 - Fix Kotlin DSL incompatibilities
 - Explicitly configure maximum memory for platform tests instead of
   relying on Gradle's default (which was decreased in 5.0)
 - Remove opt-in to STABLE_PUBLISHING feature which is now always active
  • Loading branch information
marcphilipp committed Nov 1, 2018
1 parent 97f67a4 commit d913bec
Show file tree
Hide file tree
Showing 9 changed files with 8 additions and 9 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ plugins {
}

buildScan {
licenseAgreementUrl = 'https://gradle.com/terms-of-service'
licenseAgree = 'yes'
termsOfServiceUrl = 'https://gradle.com/terms-of-service'
termsOfServiceAgree = 'yes'
}

def buildTimeAndDate = OffsetDateTime.now()
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/Versions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ object Versions {
val slf4j = "1.7.25"

// Plugins
val buildScanPlugin = "1.16"
val buildScanPlugin = "2.0.1"
val gitPublishPlugin = "1.0.1"
val jmhPlugin = "0.4.7"
val shadowPlugin = "4.0.1"
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-rc-1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
DEFAULT_JVM_OPTS='"-Xmx64m"'

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
Expand Down
2 changes: 1 addition & 1 deletion gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=
set DEFAULT_JVM_OPTS="-Xmx64m"

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ val shadowJar by tasks.getting(ShadowJar::class) {
}

classifier = ""
configurations = listOf(project.configurations.shadowed)
configurations = listOf(project.configurations["shadowed"])

// https://github.com/junit-team/junit5/issues/761
// prevent duplicates, add 3rd-party licenses explicitly
Expand Down
1 change: 1 addition & 0 deletions platform-tests/platform-tests.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ tasks.named<Test>("test") {
useJUnitPlatform {
excludeTags("exclude")
}
jvmArgs = listOf("-Xmx1g")
}

dependencies {
Expand Down
2 changes: 0 additions & 2 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,3 @@ rootProject.children.forEach { project ->
"${project.buildFile} must exist"
}
}

enableFeaturePreview("STABLE_PUBLISHING")

0 comments on commit d913bec

Please sign in to comment.