moving to bintray, centralized gradle logic with custom plugin

lamba92 · Lamba92 · commit 5fbe01d63b0c · 2019-11-14T01:27:42.000+01:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -30,4 +30,9 @@ tasks.register<Zip>("zipNodePackages") {
     }
     archiveBaseName.set("node_package")
     destinationDirectory.set(buildDir)
+}
+
+extensions.findByName("buildScan")?.withGroovyBuilder {
+    setProperty("termsOfServiceUrl", "https://gradle.com/terms-of-service")
+    setProperty("termsOfServiceAgree", "yes")
 }
diff --git a/buildSrc/src/main/kotlin/com/github/lamba92/dragalialost/build/DragaliaPlugin.kt b/buildSrc/src/main/kotlin/com/github/lamba92/dragalialost/build/DragaliaPlugin.kt
@@ -19,11 +19,6 @@ class DragaliaPlugin : Plugin<Project> {
         plugins.apply("org.gradle.maven-publish")
         plugins.apply("com.jfrog.bintray")
 
-        extensions.findByName("buildScan")?.withGroovyBuilder {
-            setProperty("termsOfServiceUrl", "https://gradle.com/terms-of-service")
-            setProperty("termsOfServiceAgree", "yes")
-        }
-
         extensions.configure<KotlinMultiplatformExtension> {
             metadata {
                 mavenPublication {
diff --git a/gradle/publish.gradle.kts b/gradle/publish.gradle.kts
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

Original file line number	Diff line number	Diff line change
`@@ -30,4 +30,9 @@ tasks.register<Zip>("zipNodePackages") {`
`30`	`30`	`}`
`31`	`31`	`archiveBaseName.set("node_package")`
`32`	`32`	`destinationDirectory.set(buildDir)`
	`33`	`+}`
	`34`	`+`
	`35`	`+extensions.findByName("buildScan")?.withGroovyBuilder {`
	`36`	`+ setProperty("termsOfServiceUrl", "https://gradle.com/terms-of-service")`
	`37`	`+ setProperty("termsOfServiceAgree", "yes")`
`33`	`38`	`}`