From 7489526eb7c362defb249994a33b2aa8d26076d8 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Sun, 16 Feb 2020 12:12:00 +0100 Subject: [PATCH] build.gradle.kts: - plugin versions now defined in single location (settings.gradle.kts) - going back to Gradle 6.1.1 - using "extra" properties for bintray user and key - allow easy enabling/disabling bintray upload dryMode and publishing --- build.gradle.kts | 11 +++++++++++ flatlaf-core/build.gradle.kts | 15 ++++++++------- flatlaf-demo/build.gradle.kts | 11 ++++++----- flatlaf-jide-oss/build.gradle.kts | 15 ++++++++------- flatlaf-swingx/build.gradle.kts | 15 ++++++++------- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle.kts | 7 +++++++ 7 files changed, 49 insertions(+), 27 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index d2c53ae4..24cc3986 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -38,3 +38,14 @@ println( "FlatLaf Version: ${version}" ) println( "Gradle ${gradle.gradleVersion} at ${gradle.gradleHomeDir}" ) println( "Java ${System.getProperty( "java.version" )}" ) println() + + +extra["bintray.user"] = System.getenv( "BINTRAY_USER" ) ?: System.getProperty( "bintray.user" ) +extra["bintray.key"] = System.getenv( "BINTRAY_KEY" ) ?: System.getProperty( "bintray.key" ) + +// if true, do not upload to bintray +extra["bintray.dryRun"] = false + +// if true, uploaded artifacts are visible to all +// if false, only visible to owner when logged into bintray +extra["bintray.publish"] = true diff --git a/flatlaf-core/build.gradle.kts b/flatlaf-core/build.gradle.kts index e2d814e4..6e62ba48 100644 --- a/flatlaf-core/build.gradle.kts +++ b/flatlaf-core/build.gradle.kts @@ -17,8 +17,8 @@ plugins { `java-library` `maven-publish` - id( "com.jfrog.bintray" ) version "1.8.4" - id( "com.jfrog.artifactory" ) version "4.13.0" + id( "com.jfrog.bintray" ) + id( "com.jfrog.artifactory" ) } if( JavaVersion.current() >= JavaVersion.VERSION_1_9 ) { @@ -127,8 +127,8 @@ publishing { } bintray { - user = System.getenv( "BINTRAY_USER" ) ?: System.getProperty( "bintray.user" ) - key = System.getenv( "BINTRAY_KEY" ) ?: System.getProperty( "bintray.key" ) + user = rootProject.extra["bintray.user"] as String? + key = rootProject.extra["bintray.key"] as String? setPublications( "maven" ) @@ -142,7 +142,8 @@ bintray { name = project.version.toString() } - publish = true + publish = rootProject.extra["bintray.publish"] as Boolean + dryRun = rootProject.extra["bintray.dryRun"] as Boolean } } @@ -152,8 +153,8 @@ artifactory { publish( closureOf { repository( delegateClosureOf { setProperty( "repoKey", "oss-snapshot-local" ) - setProperty( "username", System.getenv( "BINTRAY_USER" ) ?: System.getProperty( "bintray.user" ) ) - setProperty( "password", System.getenv( "BINTRAY_KEY" ) ?: System.getProperty( "bintray.key" ) ) + setProperty( "username", rootProject.extra["bintray.user"] as String? ) + setProperty( "password", rootProject.extra["bintray.key"] as String? ) } ) defaults( delegateClosureOf { diff --git a/flatlaf-demo/build.gradle.kts b/flatlaf-demo/build.gradle.kts index ab50c34d..661fd3b5 100644 --- a/flatlaf-demo/build.gradle.kts +++ b/flatlaf-demo/build.gradle.kts @@ -16,7 +16,7 @@ plugins { `java-library` - id( "com.jfrog.bintray" ) version "1.8.4" + id( "com.jfrog.bintray" ) // Although artifactory plugin is not used in this subproject, the plugin is required // because otherwise gradle fails with following error: @@ -24,7 +24,7 @@ plugins { // Cannot cast object 'task ':bintrayUpload'' // with class 'com.jfrog.bintray.gradle.tasks.BintrayUploadTask_Decorated' // to class 'com.jfrog.bintray.gradle.tasks.BintrayUploadTask' - id( "com.jfrog.artifactory" ) version "4.13.0" + id( "com.jfrog.artifactory" ) } dependencies { @@ -58,8 +58,8 @@ tasks { } bintray { - user = System.getenv( "BINTRAY_USER" ) ?: System.getProperty( "bintray.user" ) - key = System.getenv( "BINTRAY_KEY" ) ?: System.getProperty( "bintray.key" ) + user = rootProject.extra["bintray.user"] as String? + key = rootProject.extra["bintray.key"] as String? setConfigurations( "archives" ) @@ -73,6 +73,7 @@ bintray { name = project.version.toString() } - publish = true + publish = rootProject.extra["bintray.publish"] as Boolean + dryRun = rootProject.extra["bintray.dryRun"] as Boolean } } diff --git a/flatlaf-jide-oss/build.gradle.kts b/flatlaf-jide-oss/build.gradle.kts index ceec2488..c921723d 100644 --- a/flatlaf-jide-oss/build.gradle.kts +++ b/flatlaf-jide-oss/build.gradle.kts @@ -17,8 +17,8 @@ plugins { `java-library` `maven-publish` - id( "com.jfrog.bintray" ) version "1.8.4" - id( "com.jfrog.artifactory" ) version "4.13.0" + id( "com.jfrog.bintray" ) + id( "com.jfrog.artifactory" ) } dependencies { @@ -100,8 +100,8 @@ publishing { } bintray { - user = System.getenv( "BINTRAY_USER" ) ?: System.getProperty( "bintray.user" ) - key = System.getenv( "BINTRAY_KEY" ) ?: System.getProperty( "bintray.key" ) + user = rootProject.extra["bintray.user"] as String? + key = rootProject.extra["bintray.key"] as String? setPublications( "maven" ) @@ -115,7 +115,8 @@ bintray { name = project.version.toString() } - publish = true + publish = rootProject.extra["bintray.publish"] as Boolean + dryRun = rootProject.extra["bintray.dryRun"] as Boolean } } @@ -125,8 +126,8 @@ artifactory { publish( closureOf { repository( delegateClosureOf { setProperty( "repoKey", "oss-snapshot-local" ) - setProperty( "username", System.getenv( "BINTRAY_USER" ) ?: System.getProperty( "bintray.user" ) ) - setProperty( "password", System.getenv( "BINTRAY_KEY" ) ?: System.getProperty( "bintray.key" ) ) + setProperty( "username", rootProject.extra["bintray.user"] as String? ) + setProperty( "password", rootProject.extra["bintray.key"] as String? ) } ) defaults( delegateClosureOf { diff --git a/flatlaf-swingx/build.gradle.kts b/flatlaf-swingx/build.gradle.kts index 34df709e..892e19a9 100644 --- a/flatlaf-swingx/build.gradle.kts +++ b/flatlaf-swingx/build.gradle.kts @@ -17,8 +17,8 @@ plugins { `java-library` `maven-publish` - id( "com.jfrog.bintray" ) version "1.8.4" - id( "com.jfrog.artifactory" ) version "4.13.0" + id( "com.jfrog.bintray" ) + id( "com.jfrog.artifactory" ) } dependencies { @@ -100,8 +100,8 @@ publishing { } bintray { - user = System.getenv( "BINTRAY_USER" ) ?: System.getProperty( "bintray.user" ) - key = System.getenv( "BINTRAY_KEY" ) ?: System.getProperty( "bintray.key" ) + user = rootProject.extra["bintray.user"] as String? + key = rootProject.extra["bintray.key"] as String? setPublications( "maven" ) @@ -115,7 +115,8 @@ bintray { name = project.version.toString() } - publish = true + publish = rootProject.extra["bintray.publish"] as Boolean + dryRun = rootProject.extra["bintray.dryRun"] as Boolean } } @@ -125,8 +126,8 @@ artifactory { publish( closureOf { repository( delegateClosureOf { setProperty( "repoKey", "oss-snapshot-local" ) - setProperty( "username", System.getenv( "BINTRAY_USER" ) ?: System.getProperty( "bintray.user" ) ) - setProperty( "password", System.getenv( "BINTRAY_KEY" ) ?: System.getProperty( "bintray.key" ) ) + setProperty( "username", rootProject.extra["bintray.user"] as String? ) + setProperty( "password", rootProject.extra["bintray.key"] as String? ) } ) defaults( delegateClosureOf { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ba94df84..1b16c34a 100644 --- 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-6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle.kts b/settings.gradle.kts index b168f8cb..1dfc5794 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -22,3 +22,10 @@ include( "flatlaf-swingx" ) include( "flatlaf-jide-oss" ) include( "flatlaf-demo" ) include( "flatlaf-testing" ) + +pluginManagement { + plugins { + id( "com.jfrog.bintray" ) version "1.8.4" + id( "com.jfrog.artifactory" ) version "4.13.0" + } +}