Updated dependencies and copyright.
This commit is contained in:
parent
7440631325
commit
b308a52d71
30 changed files with 49 additions and 73 deletions
|
@ -1,4 +1,4 @@
|
|||
Copyright (c) 2018-2020, Erik C. Thauvin (erik@thauvin.net)
|
||||
Copyright (c) 2018-2021, Erik C. Thauvin (erik@thauvin.net)
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -4,19 +4,19 @@ plugins {
|
|||
`java-gradle-plugin`
|
||||
`maven-publish`
|
||||
jacoco
|
||||
kotlin("jvm") version "1.3.72"
|
||||
id("com.github.ben-manes.versions") version "0.36.0"
|
||||
id("com.gradle.plugin-publish") version "0.12.0"
|
||||
id("io.gitlab.arturbosch.detekt") version "1.14.2"
|
||||
id("org.gradle.kotlin.kotlin-dsl") version "1.3.6"
|
||||
id("org.sonarqube") version "3.0"
|
||||
kotlin("jvm") version "1.4.31"
|
||||
id("com.github.ben-manes.versions") version "0.38.0"
|
||||
id("com.gradle.plugin-publish") version "0.14.0"
|
||||
id("io.gitlab.arturbosch.detekt") version "1.16.0"
|
||||
id("org.gradle.kotlin.kotlin-dsl") version "2.1.4"
|
||||
id("org.sonarqube") version "3.1.1"
|
||||
}
|
||||
|
||||
version = "1.0.5-beta"
|
||||
version = "1.0.5"
|
||||
group = "net.thauvin.erik.gradle"
|
||||
|
||||
object VersionInfo {
|
||||
const val spek = "2.0.13"
|
||||
const val spek = "2.0.15"
|
||||
}
|
||||
val versions: VersionInfo by extra { VersionInfo }
|
||||
|
||||
|
@ -24,6 +24,7 @@ val github = "https://github.com/ethauvin/semver-gradle"
|
|||
val packageName = "net.thauvin.erik.gradle.semver"
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
jcenter()
|
||||
}
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@ plugins {
|
|||
id 'java'
|
||||
id 'application'
|
||||
id 'net.thauvin.erik.gradle.semver' version '1.0.4'
|
||||
id 'com.github.ben-manes.versions' version '0.28.0'
|
||||
id 'com.github.ben-manes.versions' version '0.38.0'
|
||||
}
|
||||
|
||||
// ./gradlew
|
||||
|
@ -28,7 +28,6 @@ tasks.withType(JavaCompile) {
|
|||
|
||||
repositories {
|
||||
mavenLocal()
|
||||
jcenter()
|
||||
}
|
||||
|
||||
run {
|
||||
|
|
Binary file not shown.
|
@ -1,5 +1,5 @@
|
|||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
|
2
examples/annotation-processor/java/gradlew
vendored
2
examples/annotation-processor/java/gradlew
vendored
|
@ -82,6 +82,7 @@ esac
|
|||
|
||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||
|
||||
|
||||
# Determine the Java command to use to start the JVM.
|
||||
if [ -n "$JAVA_HOME" ] ; then
|
||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||
|
@ -129,6 +130,7 @@ fi
|
|||
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
|
||||
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
||||
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
||||
|
||||
JAVACMD=`cygpath --unix "$JAVACMD"`
|
||||
|
||||
# We build the pattern for arguments to be converted via cygpath
|
||||
|
|
22
examples/annotation-processor/java/gradlew.bat
vendored
22
examples/annotation-processor/java/gradlew.bat
vendored
|
@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
|
|||
|
||||
set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if "%ERRORLEVEL%" == "0" goto init
|
||||
if "%ERRORLEVEL%" == "0" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
|
@ -54,7 +54,7 @@ goto fail
|
|||
set JAVA_HOME=%JAVA_HOME:"=%
|
||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto init
|
||||
if exist "%JAVA_EXE%" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||
|
@ -64,28 +64,14 @@ echo location of your Java installation.
|
|||
|
||||
goto fail
|
||||
|
||||
:init
|
||||
@rem Get command-line arguments, handling Windows variants
|
||||
|
||||
if not "%OS%" == "Windows_NT" goto win9xME_args
|
||||
|
||||
:win9xME_args
|
||||
@rem Slurp the command line arguments.
|
||||
set CMD_LINE_ARGS=
|
||||
set _SKIP=2
|
||||
|
||||
:win9xME_args_slurp
|
||||
if "x%~1" == "x" goto execute
|
||||
|
||||
set CMD_LINE_ARGS=%*
|
||||
|
||||
:execute
|
||||
@rem Setup the command line
|
||||
|
||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||
|
||||
|
||||
@rem Execute Gradle
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
|
|
|
@ -14,7 +14,7 @@ import java.util.Date;
|
|||
*/
|
||||
public final class GeneratedVersion {
|
||||
public static final String PROJECT = "Java Example";
|
||||
public static final Date BUILDDATE = new Date(1564027571537L);
|
||||
public static final Date BUILDDATE = new Date(1619649806553L);
|
||||
public static final int MAJOR = 2;
|
||||
public static final int MINOR = 10;
|
||||
public static final int PATCH = 0;
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
plugins {
|
||||
kotlin("jvm").version("1.3.61")
|
||||
kotlin("jvm").version("1.5.0")
|
||||
application
|
||||
id("org.jetbrains.kotlin.kapt").version("1.3.61")
|
||||
id("org.jetbrains.kotlin.kapt").version("1.5.0")
|
||||
id("net.thauvin.erik.gradle.semver").version("1.0.4")
|
||||
id("com.github.ben-manes.versions").version("0.28.0")
|
||||
id("com.github.ben-manes.versions").version("0.38.0")
|
||||
}
|
||||
|
||||
// ./gradlew
|
||||
|
|
Binary file not shown.
|
@ -1,5 +1,5 @@
|
|||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
|
2
examples/annotation-processor/kotlin/gradlew
vendored
2
examples/annotation-processor/kotlin/gradlew
vendored
|
@ -82,6 +82,7 @@ esac
|
|||
|
||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||
|
||||
|
||||
# Determine the Java command to use to start the JVM.
|
||||
if [ -n "$JAVA_HOME" ] ; then
|
||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||
|
@ -129,6 +130,7 @@ fi
|
|||
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
|
||||
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
||||
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
||||
|
||||
JAVACMD=`cygpath --unix "$JAVACMD"`
|
||||
|
||||
# We build the pattern for arguments to be converted via cygpath
|
||||
|
|
22
examples/annotation-processor/kotlin/gradlew.bat
vendored
22
examples/annotation-processor/kotlin/gradlew.bat
vendored
|
@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
|
|||
|
||||
set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if "%ERRORLEVEL%" == "0" goto init
|
||||
if "%ERRORLEVEL%" == "0" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
|
@ -54,7 +54,7 @@ goto fail
|
|||
set JAVA_HOME=%JAVA_HOME:"=%
|
||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto init
|
||||
if exist "%JAVA_EXE%" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||
|
@ -64,28 +64,14 @@ echo location of your Java installation.
|
|||
|
||||
goto fail
|
||||
|
||||
:init
|
||||
@rem Get command-line arguments, handling Windows variants
|
||||
|
||||
if not "%OS%" == "Windows_NT" goto win9xME_args
|
||||
|
||||
:win9xME_args
|
||||
@rem Slurp the command line arguments.
|
||||
set CMD_LINE_ARGS=
|
||||
set _SKIP=2
|
||||
|
||||
:win9xME_args_slurp
|
||||
if "x%~1" == "x" goto execute
|
||||
|
||||
set CMD_LINE_ARGS=%*
|
||||
|
||||
:execute
|
||||
@rem Setup the command line
|
||||
|
||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||
|
||||
|
||||
@rem Execute Gradle
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
|
|
|
@ -2,7 +2,7 @@ plugins {
|
|||
id 'java'
|
||||
id 'application'
|
||||
id 'net.thauvin.erik.gradle.semver' version '1.0.4'
|
||||
id 'com.github.ben-manes.versions' version '0.36.0'
|
||||
id 'com.github.ben-manes.versions' version '0.38.0'
|
||||
}
|
||||
|
||||
// ./gradlew
|
||||
|
@ -21,7 +21,7 @@ dependencies {
|
|||
}
|
||||
|
||||
repositories {
|
||||
jcenter()
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
test {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
|
|
@ -4,10 +4,10 @@ import java.time.LocalDateTime
|
|||
import java.time.format.DateTimeFormatter
|
||||
|
||||
plugins {
|
||||
kotlin("jvm").version("1.4.10")
|
||||
kotlin("jvm").version("1.5.0")
|
||||
application
|
||||
id("net.thauvin.erik.gradle.semver").version("1.0.4")
|
||||
id("com.github.ben-manes.versions").version("0.36.0")
|
||||
id("com.github.ben-manes.versions").version("0.38.0")
|
||||
}
|
||||
|
||||
// ./gradlew
|
||||
|
@ -20,11 +20,11 @@ defaultTasks(ApplicationPlugin.TASK_RUN_NAME)
|
|||
|
||||
dependencies {
|
||||
implementation(kotlin("stdlib"))
|
||||
testImplementation("org.testng:testng:7.3.0")
|
||||
testImplementation("org.testng:testng:7.4.0")
|
||||
}
|
||||
|
||||
repositories {
|
||||
jcenter()
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
application {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
|
@ -1,5 +1,5 @@
|
|||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
|
2
preflightcheck.sh
Normal file → Executable file
2
preflightcheck.sh
Normal file → Executable file
|
@ -2,7 +2,7 @@
|
|||
|
||||
# set source and test locations
|
||||
src="src/main/kotlin/net/thauvin/erik/gradle/semver/"
|
||||
test="src/main/kotlin/net/thauvin/erik/gradle/semver/"
|
||||
test="src/test/kotlin/net/thauvin/erik/gradle/semver/"
|
||||
# e.g: .java, .kt, etc.
|
||||
ext=".kt"
|
||||
java8=true
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* SemverConfig.kt
|
||||
*
|
||||
* Copyright (c) 2018-2020, Erik C. Thauvin (erik@thauvin.net)
|
||||
* Copyright (c) 2018-2021, Erik C. Thauvin (erik@thauvin.net)
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* SemverIncrementBuildMetaTask.kt
|
||||
*
|
||||
* Copyright (c) 2018-2020, Erik C. Thauvin (erik@thauvin.net)
|
||||
* Copyright (c) 2018-2021, Erik C. Thauvin (erik@thauvin.net)
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* SemverIncrementTask.kt
|
||||
*
|
||||
* Copyright (c) 2018-2020, Erik C. Thauvin (erik@thauvin.net)
|
||||
* Copyright (c) 2018-2021, Erik C. Thauvin (erik@thauvin.net)
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* SemverPlugin.kt
|
||||
*
|
||||
* Copyright (c) 2018-2020, Erik C. Thauvin (erik@thauvin.net)
|
||||
* Copyright (c) 2018-2021, Erik C. Thauvin (erik@thauvin.net)
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* SortedProperties.kt
|
||||
*
|
||||
* Copyright (c) 2018-2020, Erik C. Thauvin (erik@thauvin.net)
|
||||
* Copyright (c) 2018-2021, Erik C. Thauvin (erik@thauvin.net)
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* Utils.kt
|
||||
*
|
||||
* Copyright (c) 2018-2020, Erik C. Thauvin (erik@thauvin.net)
|
||||
* Copyright (c) 2018-2021, Erik C. Thauvin (erik@thauvin.net)
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* Version.kt
|
||||
*
|
||||
* Copyright (c) 2018-2020, Erik C. Thauvin (erik@thauvin.net)
|
||||
* Copyright (c) 2018-2021, Erik C. Thauvin (erik@thauvin.net)
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* SemverConfigSpec.kt
|
||||
*
|
||||
* Copyright (c) 2018-2020, Erik C. Thauvin (erik@thauvin.net)
|
||||
* Copyright (c) 2018-2021, Erik C. Thauvin (erik@thauvin.net)
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* SemverVersionSpec.kt
|
||||
*
|
||||
* Copyright (c) 2018-2020, Erik C. Thauvin (erik@thauvin.net)
|
||||
* Copyright (c) 2018-2021, Erik C. Thauvin (erik@thauvin.net)
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* UtilsSpec.kt
|
||||
*
|
||||
* Copyright (c) 2018-2020, Erik C. Thauvin (erik@thauvin.net)
|
||||
* Copyright (c) 2018-2021, Erik C. Thauvin (erik@thauvin.net)
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
0
updatewrappers.sh
Normal file → Executable file
0
updatewrappers.sh
Normal file → Executable file
Loading…
Add table
Add a link
Reference in a new issue