diff --git a/.gitignore b/.gitignore index 0c05d76..826f7b0 100644 --- a/.gitignore +++ b/.gitignore @@ -67,12 +67,11 @@ gradle-app.setting # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) !gradle-wrapper.jar +!gradle-wrapper.properties # Cache of project .gradletasknamecache -# Work around https://youtrack.jetbrains.com/issue/IDEA-116898 -gradle/wrapper/gradle-wrapper.properties @@ -82,10 +81,6 @@ gradle/wrapper/gradle-wrapper.properties # 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 1b16218..9ef8b7f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,9 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Build_gradle.Extras.id -import Build_gradle.Extras.tags -import Build_gradle.Extras.url import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import java.time.Instant import java.util.* @@ -31,6 +28,7 @@ plugins { id("com.gradle.plugin-publish") version "0.10.1" id("com.dorkbox.Licensing") version "1.4" id("com.dorkbox.VersionUpdate") version "1.4.1" + id("com.dorkbox.GradleUtils") version "1.0" kotlin("jvm") version "1.3.21" } @@ -39,7 +37,7 @@ object Extras { // set for the project const val description = "Gradle Plugin to manage various Gradle tasks, such as updating gradle and dependencies" const val group = "com.dorkbox" - const val version = "1.0" + const val version = "1.1" // set as project.ext const val name = "Gradle Utils" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..5c2d1cf 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 new file mode 100644 index 0000000..ee69dd6 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index af6708f..b0d6d0a 100755 --- a/gradlew +++ b/gradlew @@ -1,5 +1,21 @@ #!/usr/bin/env sh +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + ############################################################################## ## ## Gradle start up script for UN*X @@ -28,7 +44,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='"-Xmx64m"' +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" diff --git a/gradlew.bat b/gradlew.bat index 6d57edc..9991c50 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem http://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -14,7 +30,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="-Xmx64m" +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome diff --git a/src/dorkbox/gradle/GradleUtils.kt b/src/dorkbox/gradle/GradleUtils.kt index b5e406b..d7218a3 100644 --- a/src/dorkbox/gradle/GradleUtils.kt +++ b/src/dorkbox/gradle/GradleUtils.kt @@ -16,7 +16,6 @@ package dorkbox.gradle import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask -import org.gradle.api.GradleException import org.gradle.api.Plugin import org.gradle.api.Project @@ -53,16 +52,5 @@ class GradleUtils : Plugin { // optional parameters checkForGradleUpdate = false } - - project.afterEvaluate { - // just make sure that we have a version defined. - val version = project.version.toString() - project.version.toString() - - if (version.isBlank() || version == Project.DEFAULT_VERSION) { - // no version info specified, but version task was called - throw GradleException("Project version information is unset. Please set via `project.version = '1.0.0'`") - } - } } }