diff --git a/.gitignore b/.gitignore index 357cba91..826f7b0d 100644 --- a/.gitignore +++ b/.gitignore @@ -81,10 +81,6 @@ gradle-app.setting # Mobile Tools for Java (J2ME) .mtj.tmp/ -# Package Files # -*.jar -*.war -*.ear # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* diff --git a/build.gradle.kts b/build.gradle.kts index f3ec3374..1a23da55 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,9 +15,6 @@ */ import Build_gradle.Extras.bcVersion -import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask -import net.sf.json.JSONObject -import java.net.URL import java.time.Instant import java.util.* import kotlin.collections.component1 @@ -48,11 +45,9 @@ plugins { id("com.dorkbox.Licensing") version "1.4" id("com.dorkbox.VersionUpdate") version "1.4.1" + id("com.dorkbox.GradleUtils") version "1.0" - // setup checking for the latest version of a plugin or dependency - id("com.github.ben-manes.versions") version "0.21.0" - - kotlin("jvm") version "1.3.21" + kotlin("jvm") version "1.3.31" } object Extras { @@ -413,70 +408,3 @@ publishing { dependsOn("publishToNexus", "closeAndReleaseRepository") } } - - -/////////////////////////////// -///// Prevent anything other than a release from showing version updates -//// https://github.com/ben-manes/gradle-versions-plugin/blob/master/README.md -/////////////////////////////// -tasks.withType { - group = "gradle" - outputs.upToDateWhen { false } - outputs.cacheIf { false } - - resolutionStrategy { - componentSelection { - all { - val rejected = listOf("alpha", "beta", "rc", "cr", "m", "preview") - .map { qualifier -> Regex("(?i).*[.-]$qualifier[.\\d-]*") } - .any { it.matches(candidate.version) } - if (rejected) { - reject("Release candidate") - } - } - } - } - - // optional parameters - checkForGradleUpdate = true -} - - -/////////////////////////////// -////// Gradle Wrapper Configuration. -///// Run this task (GRADLE -> autoUpdateGradleWrapper), then refresh the gradle project -/////////////////////////////// -task("autoUpdateGradleWrapper") { - group = "gradle" - outputs.upToDateWhen { false } - outputs.cacheIf { false } - - // always make sure this task when specified. ALWAYS skip for other tasks, Never skip for us. - // This is a little bit of a PITA, because of how gradle configures, then runs tasks... - if (gradle.startParameter.taskNames.contains("autoUpdateGradleWrapper")) { - finalizedBy(task("autoUpdateGradleWrapperDownloader") { - group = "gradle" - outputs.upToDateWhen { false } - outputs.cacheIf { false } - - val releaseText = URL("https://services.gradle.org/versions/current").readText() - val foundGradleVersion = JSONObject.fromObject(releaseText)["version"] as String? - - if (foundGradleVersion.isNullOrEmpty()) { - println("\tUnable to detect Newest Gradle Version. Output json: $releaseText") - } - else { - println("\tDetected Newest Gradle Version: '$foundGradleVersion'") - - finalizedBy(task("wrapperUpdate") { - group = "gradle" - outputs.upToDateWhen { false } - outputs.cacheIf { false } - - gradleVersion = foundGradleVersion - distributionUrl = distributionUrl.replace("bin", "all") - }) - } - }) - } -} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..5c2d1cf0 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b8a51fe2..ee69dd68 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-5.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists