Skip to content

Commit 2e8f2d0

Browse files
sf105sf105
authored
Merge pull request hamcrest#221 from tumbarumba/upgrade-gradle-4.10.2
Gradle build improvements
2 parents 31c07d9 + 8d9b7b6 commit 2e8f2d0

File tree

6 files changed

+176
-179
lines changed

6 files changed

+176
-179
lines changed

‎build.gradle

Lines changed: 46 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
import static org.gradle.api.JavaVersion.VERSION_1_7
22

33
apply plugin: 'java'
4-
apply plugin: 'maven'
54
apply plugin: 'osgi'
65
apply plugin: 'signing'
76
apply plugin: 'maven-publish'
87

98
sourceCompatibility = VERSION_1_7
109
targetCompatibility = VERSION_1_7
11-
archivesBaseName = "java-hamcrest"
1210

1311
group = "org.hamcrest"
1412
version = "2.0.0.0"
@@ -66,67 +64,63 @@ task javadocJar(type: Jar) {
6664
from javadoc
6765
}
6866

69-
artifacts {
70-
archives sourcesJar, javadocJar
71-
}
72-
73-
signing {
74-
required { gradle.taskGraph.hasTask("uploadArchives") }
75-
sign configurations.archives
76-
}
77-
78-
uploadArchives {
79-
if (hasProperty('ossrhUsername') && hasProperty('ossrhPassword')) {
80-
repositories {
81-
mavenDeployer {
82-
beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
83-
84-
repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
85-
authentication(userName: ossrhUsername, password: ossrhPassword)
67+
publishing {
68+
publications {
69+
mavenJava(MavenPublication) {
70+
artifactId = 'java-hamcrest'
71+
from components.java
72+
artifact sourcesJar
73+
artifact javadocJar
74+
pom {
75+
name = 'Java Hamcrest'
76+
description = 'Hamcrest matcher library for Java'
77+
url = 'http://hamcrest.org/JavaHamcrest/'
78+
79+
scm {
80+
connection = 'git@github.com:hamcrest/JavaHamcrest.git'
81+
url = 'https://github.com/hamcrest/JavaHamcrest'
8682
}
8783

88-
snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
89-
authentication(userName: ossrhUsername, password: ossrhPassword)
84+
licenses {
85+
license {
86+
name = 'BSD Licence 3'
87+
url = 'http://opensource.org/licenses/BSD-3-Clause'
88+
}
9089
}
9190

92-
pom.project {
93-
name 'Java Hamcrest'
94-
packaging 'jar'
95-
description 'Hamcrest matcher library for Java'
96-
url 'http://hamcrest.org/JavaHamcrest/'
97-
98-
scm {
99-
connection 'git@github.com:hamcrest/JavaHamcrest.git'
100-
url 'https://github.com/hamcrest/JavaHamcrest'
91+
developers {
92+
developer {
93+
id = 'joewalnes'
94+
name = 'Joe Walnes'
10195
}
102-
103-
licenses {
104-
license {
105-
name 'BSD Licence 3'
106-
url 'http://opensource.org/licenses/BSD-3-Clause'
107-
}
96+
developer {
97+
id = 'npryce'
98+
name = 'Nat Pryce'
10899
}
109-
110-
developers {
111-
developer {
112-
id 'joewalnes'
113-
name 'Joe Walnes'
114-
}
115-
developer {
116-
id 'npryce'
117-
name 'Nat Pryce'
118-
}
119-
developer {
120-
id 'sf105'
121-
name 'Steve Freeman'
122-
}
100+
developer {
101+
id = 'sf105'
102+
name = 'Steve Freeman'
123103
}
124104
}
125105
}
126106
}
127107
}
108+
repositories {
109+
if (hasProperty('ossrhUsername') && hasProperty('ossrhPassword')) {
110+
maven {
111+
def snapshotRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
112+
def stagingRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
113+
url = version.contains('SNAPSHOT') ? snapshotRepoUrl : stagingRepoUrl
114+
credentials {
115+
username = ossrhUsername
116+
password = ossrhPassword
117+
}
118+
}
119+
}
120+
}
128121
}
129122

130-
task wrapper(type: Wrapper) {
131-
gradleVersion = '4.5'
123+
signing {
124+
required { hasProperty('ossrhUsername') && hasProperty('ossrhPassword') }
125+
sign publishing.publications.mavenJava
132126
}

‎gradle/wrapper/gradle-wrapper.jar

3.82 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Sun Jan 28 12:06:39 GMT 2018
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.5-bin.zip

‎gradlew

Lines changed: 43 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,43 @@
1-
#!/usr/bin/env bash
1+
#!/usr/bin/env sh
22

33
##############################################################################
44
##
55
## Gradle start up script for UN*X
66
##
77
##############################################################################
88

9-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
10-
DEFAULT_JVM_OPTS=""
9+
# Attempt to set APP_HOME
10+
# Resolve links: $0 may be a link
11+
PRG="$0"
12+
# Need this for relative symlinks.
13+
while [ -h "$PRG" ] ; do
14+
ls=`ls -ld "$PRG"`
15+
link=`expr "$ls" : '.*-> \(.*\)$'`
16+
if expr "$link" : '/.*' > /dev/null; then
17+
PRG="$link"
18+
else
19+
PRG=`dirname "$PRG"`"/$link"
20+
fi
21+
done
22+
SAVED="`pwd`"
23+
cd "`dirname \"$PRG\"`/" >/dev/null
24+
APP_HOME="`pwd -P`"
25+
cd "$SAVED" >/dev/null
1126

1227
APP_NAME="Gradle"
1328
APP_BASE_NAME=`basename "$0"`
1429

30+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31+
DEFAULT_JVM_OPTS=""
32+
1533
# Use the maximum available, or set MAX_FD != -1 to use that value.
1634
MAX_FD="maximum"
1735

18-
warn ( ) {
36+
warn () {
1937
echo "$*"
2038
}
2139

22-
die ( ) {
40+
die () {
2341
echo
2442
echo "$*"
2543
echo
@@ -30,6 +48,7 @@ die ( ) {
3048
cygwin=false
3149
msys=false
3250
darwin=false
51+
nonstop=false
3352
case "`uname`" in
3453
CYGWIN* )
3554
cygwin=true
@@ -40,31 +59,11 @@ case "`uname`" in
4059
MINGW* )
4160
msys=true
4261
;;
62+
NONSTOP* )
63+
nonstop=true
64+
;;
4365
esac
4466

45-
# For Cygwin, ensure paths are in UNIX format before anything is touched.
46-
if $cygwin ; then
47-
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
48-
fi
49-
50-
# Attempt to set APP_HOME
51-
# Resolve links: $0 may be a link
52-
PRG="$0"
53-
# Need this for relative symlinks.
54-
while [ -h "$PRG" ] ; do
55-
ls=`ls -ld "$PRG"`
56-
link=`expr "$ls" : '.*-> \(.*\)$'`
57-
if expr "$link" : '/.*' > /dev/null; then
58-
PRG="$link"
59-
else
60-
PRG=`dirname "$PRG"`"/$link"
61-
fi
62-
done
63-
SAVED="`pwd`"
64-
cd "`dirname \"$PRG\"`/" >&-
65-
APP_HOME="`pwd -P`"
66-
cd "$SAVED" >&-
67-
6867
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
6968

7069
# Determine the Java command to use to start the JVM.
@@ -90,7 +89,7 @@ location of your Java installation."
9089
fi
9190

9291
# Increase the maximum file descriptors if we can.
93-
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
92+
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
9493
MAX_FD_LIMIT=`ulimit -H -n`
9594
if [ $? -eq 0 ] ; then
9695
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
114113
if $cygwin ; then
115114
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
116115
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
116+
JAVACMD=`cygpath --unix "$JAVACMD"`
117117

118118
# We build the pattern for arguments to be converted via cygpath
119119
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,11 +154,19 @@ if $cygwin ; then
154154
esac
155155
fi
156156

157-
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
158-
function splitJvmOpts() {
159-
JVM_OPTS=("$@")
157+
# Escape application args
158+
save () {
159+
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160+
echo " "
160161
}
161-
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
162-
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
162+
APP_ARGS=$(save "$@")
163+
164+
# Collect all arguments for the java command, following the shell quoting and substitution rules
165+
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
166+
167+
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
168+
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
169+
cd "$(dirname "$0")"
170+
fi
163171

164-
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
172+
exec "$JAVACMD" "$@"

0 commit comments

Comments
 (0)