Skip to content
Snippets Groups Projects
Commit 80a39d2a authored by Uwe Peuker's avatar Uwe Peuker
Browse files

Anpassungen für zukünftiges Gradle 7.0

parent 2a4543e8
Branches
Tags v0.18.0
No related merge requests found
Pipeline #3967 passed
Stage: test
Show whitespace changes
Inline Side-by-side
CHANGELOG.md
+ 4
− 0
View file @ 80a39d2a
......@@ -3,6 +3,10 @@ Versionsverlauf
## [Noch nicht veröffentlicht]
## [Version 0.18.0] - 22.03.2020
- Deprecated Features für zukünftiges Gradle 7.0 korrigiert
## [Version 0.17.0] - 05.09.2019
- zusätzliche Publishing-Tasks
......
build.gradle
+ 3
− 4
View file @ 80a39d2a
......@@ -2,11 +2,10 @@ plugins {
id 'com.gradle.plugin-publish' version '0.10.1'
}
version '0.17.0'
version '0.18.0'
group 'de.bsvrz'
apply plugin: 'groovy'
apply plugin: 'maven'
apply plugin: 'maven-publish'
sourceCompatibility = 1.8
......@@ -19,8 +18,8 @@ repositories {
}
dependencies {
compile gradleApi()
testCompile 'junit:junit:4.12'
implementation gradleApi()
testImplementation 'junit:junit:4.12'
}
pluginBundle {
......
gradle/wrapper/gradle-wrapper.jar
+ 0
− 0
View file @ 80a39d2a
No preview for this file type
gradle/wrapper/gradle-wrapper.properties
+ 1
− 1
View file @ 80a39d2a
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
gradlew
+ 12
− 17
View file @ 80a39d2a
......@@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
else
eval `echo args$i`="\"$arg\""
fi
i=$((i+1))
i=`expr $i + 1`
done
case $i in
(0) set -- ;;
(1) set -- "$args0" ;;
(2) set -- "$args0" "$args1" ;;
(3) set -- "$args0" "$args1" "$args2" ;;
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
0) set -- ;;
1) set -- "$args0" ;;
2) set -- "$args0" "$args1" ;;
3) set -- "$args0" "$args1" "$args2" ;;
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi
......@@ -175,14 +175,9 @@ save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=$(save "$@")
APP_ARGS=`save "$@"`
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
cd "$(dirname "$0")"
fi
exec "$JAVACMD" "$@"
gradlew.bat
+ 3
− 0
View file @ 80a39d2a
......@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@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" "-Xms64m"
......
src/main/groovy/de/bsvrz/gradle/nerzswe/BuildReport.groovy
+ 2
− 1
View file @ 80a39d2a
package de.bsvrz.gradle.nerzswe
import org.gradle.api.DefaultTask
import org.gradle.api.tasks.Input
import org.gradle.api.tasks.OutputFile
import org.gradle.api.tasks.TaskAction
import static de.bsvrz.gradle.nerzswe.SwePlugin.*
......@@ -14,7 +15,7 @@ class BuildReport extends DefaultTask{
private String reportFile = "${project.buildDir}/txt/${project.archivesBaseName}-Build-Report.txt"
// description
String description = """Erstellt Build-Report
@Input String description = """Erstellt Build-Report
$reportFile"""
@OutputFile
......
src/main/groovy/de/bsvrz/gradle/nerzswe/SwePlugin.groovy
+ 9
− 9
View file @ 80a39d2a
package de.bsvrz.gradle.nerzswe
import org.gradle.api.plugins.JavaBasePlugin
import org.gradle.api.JavaVersion
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.publish.maven.MavenPublication
......@@ -25,7 +26,7 @@ class SwePlugin implements Plugin<Project> {
// NERZ-Repositories
project.repositories {
maven { url 'https://repo.nerz-ev.de/repository/nerz-maven-public/' }
maven { url 'http://h2727649.stratoserver.net:8081/repository/nerz-maven-public/' }
maven { url 'https://h2727649.stratoserver.net:8081/repository/nerz-maven-public/' }
maven { url 'https://dl.bintray.com/bitctrl/maven/' }
mavenCentral()
mavenLocal()
......@@ -35,7 +36,6 @@ class SwePlugin implements Plugin<Project> {
apply plugin: 'java'
apply plugin: 'java-library'
apply plugin: 'checkstyle'
apply plugin: 'maven'
apply plugin: 'maven-publish'
}
......@@ -56,7 +56,7 @@ class SwePlugin implements Plugin<Project> {
if (!pruefung.isEmpty()) {
throw new StopActionException(pruefung)
}
archiveName = "SWE_${project.archivesBaseName}_${project.extensions.nerzswe.sweStatus}_V${project.version}_D${project.extensions.nerzswe.sweDatum}.zip"
archiveFileName = "SWE_${project.archivesBaseName}_${project.extensions.nerzswe.sweStatus}_V${project.version}_D${project.extensions.nerzswe.sweDatum}.zip"
}
}
project.tasks.sweCollect.finalizedBy(project.tasks.swePaket)
......@@ -76,7 +76,7 @@ class SwePlugin implements Plugin<Project> {
File csConfigFile = project.extensions.checkstyle.configFile
if (csConfigFile.exists()) {
String csHeader = project.extensions.checkstyle.configDir
String csHeader = project.extensions.checkstyle.configDirectory
csHeader = csHeader + "/java.header"
project.extensions.checkstyle.configProperties = ['checkstyle.header.file': csHeader]
project.extensions.checkstyle.showViolations = false
......@@ -232,8 +232,8 @@ class SwePlugin implements Plugin<Project> {
}
private void configureJavaDefaults(project) {
project.sourceCompatibility = '1.8'
project.targetCompatibility = '1.8'
project.sourceCompatibility = JavaVersion.VERSION_1_8
project.targetCompatibility = JavaVersion.VERSION_1_8
project.tasks.withType(JavaCompile).all {
it.options.encoding = 'UTF-8'
}
......@@ -301,7 +301,7 @@ class SwePlugin implements Plugin<Project> {
manifest {
attributes("Implementation-Title": project.description + " (Tests)",
"Implementation-Version": project.version,
"Class-Path": calculateNerzClassPath(project, project.configurations.testRuntime))
"Class-Path": calculateNerzClassPath(project, project.configurations.testRuntimeClasspath))
}
}
project.artifacts.archives project.tasks.packageTests
......@@ -356,8 +356,8 @@ class SwePlugin implements Plugin<Project> {
project.task("zipJavadoc", type: Zip) {
from new File(project.docsDir, "/javadoc")
archiveName = project.archivesBaseName + "-doc.zip"
destinationDir = new File(project.docsDir, "/zip")
archiveFileName = project.archivesBaseName + "-doc.zip"
destinationDirectory = new File(project.docsDir, "/zip")
}
project.tasks.javadoc.finalizedBy(project.tasks.zipJavadoc)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment