Skip to content

Commit cd9c28f

Browse files
baywetbaywet
committed
- upgrades gradle from 4.5 to 6.6
1 parent 93113bd commit cd9c28f

File tree

6 files changed

+93
-146
lines changed

6 files changed

+93
-146
lines changed

‎build.gradle‎

Lines changed: 33 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
/*
2-
* This build file was generated by the Gradle 'init' task.
2+
* This file was generated by the Gradle 'init' task.
33
*
44
* This generated file contains a sample Java Library project to get you started.
55
* For more details take a look at the Java Libraries chapter in the Gradle
6-
* user guide available at https://docs.gradle.org/4.5/userguide/java_library_plugin.html
6+
* User Manual available at https://docs.gradle.org/6.6/userguide/java_library_plugin.html
77
*/
88

9-
// Apply the java-library plugin to add support for Java Library
10-
apply plugin: 'java-library'
11-
apply plugin: 'java'
12-
apply plugin: 'eclipse'
13-
apply plugin: 'maven'
14-
apply plugin: 'maven-publish'
15-
apply plugin: 'signing'
9+
plugins {
10+
// Apply the java-library plugin to add support for Java Library
11+
id 'java-library'
12+
id 'java'
13+
id 'eclipse'
14+
id 'maven-publish'
15+
id 'signing'
16+
}
1617

1718
// In this section you declare where to find the dependencies of your project
1819
repositories {
@@ -23,21 +24,18 @@ repositories {
2324
}
2425

2526
dependencies {
26-
// This dependency is exported to consumers, that is to say found on their compile classpath.
27-
api 'org.apache.commons:commons-math3:3.6.1'
28-
2927
// This dependency is used internally, and not exposed to consumers on their own compile classpath.
3028
implementation 'com.google.guava:guava:20.0'
3129

3230
// Use JUnit test framework
3331
testImplementation 'junit:junit:4.13'
3432

35-
compile 'com.google.code.gson:gson:2.8.6'
33+
implementation 'com.google.code.gson:gson:2.8.6'
3634

37-
compile 'com.sun.jersey:jersey-server:1.19.4'
35+
implementation 'com.sun.jersey:jersey-server:1.19.4'
3836

3937
// Core Http library
40-
compile('com.microsoft.graph:microsoft-graph-core:1.0.1')
38+
implementation 'com.microsoft.graph:microsoft-graph-core:1.0.1'
4139
}
4240

4341
def pomConfig = {
@@ -54,7 +52,21 @@ def pomConfig = {
5452
//Maven Central Snapshot: publishSnapshotPublicationToMavenRepository
5553
//Maven Central Release: publishMavenCentralReleasePublicationToMaven2Repository
5654
//Bintray Snapshot: publishSnapshotPublicationToMaven3Repository
57-
//Bintray Release: uploadArchives
55+
56+
task sourceJar(type: Jar) {
57+
from sourceSets.main.allJava
58+
archiveClassifier = 'sources'
59+
}
60+
61+
task javadocJar(type: Jar, dependsOn: javadoc) {
62+
from javadoc.destinationDir
63+
archiveClassifier = 'javadoc'
64+
}
65+
66+
signing {
67+
sign configurations.archives
68+
}
69+
tasks.withType(Sign)*.enabled = mavenCentralPublishingEnabled.toBoolean()
5870

5971
publishing {
6072

@@ -71,6 +83,7 @@ publishing {
7183
from components.java
7284

7385
artifact sourceJar
86+
artifact javadocJar
7487
pom.withXml {
7588
def root = asNode()
7689
root.appendNode('name', 'Microsoft Graph Beta SDK for Java')
@@ -91,12 +104,8 @@ publishing {
91104
def pomFile = file("${project.buildDir}/generated-pom.xml")
92105
writeTo(pomFile)
93106
}
94-
artifact(sourceJar) {
95-
classifier = 'sources'
96-
}
97-
artifact(javadocJar) {
98-
classifier = 'javadoc'
99-
}
107+
artifact sourceJar
108+
artifact javadocJar
100109
}
101110

102111
mavenCentralRelease(MavenPublication) {
@@ -114,12 +123,8 @@ publishing {
114123
extension = 'pom.asc'
115124
}
116125
}
117-
artifact(sourceJar) {
118-
classifier = 'sources'
119-
}
120-
artifact(javadocJar) {
121-
classifier = 'javadoc'
122-
}
126+
artifact sourceJar
127+
artifact javadocJar
123128
project.tasks.signArchives.signatureFiles.each {
124129
artifact(it) {
125130
def matcher = it.file =~ /-(sources|javadoc)\.jar\.asc$/
@@ -192,11 +197,6 @@ publishing {
192197

193198
}
194199

195-
task sourceJar(type: Jar) {
196-
classifier = 'sources'
197-
from sourceSets.main.allJava
198-
}
199-
200200
compileJava {
201201
sourceCompatibility = 1.8
202202
targetCompatibility = 1.8
@@ -210,74 +210,12 @@ def getVersionName() {
210210
return "${mavenMajorVersion}.${mavenMinorVersion}.${mavenPatchVersion}${mavenArtifactSuffix}"
211211
}
212212

213-
uploadArchives {
214-
215-
def bintrayUsername = ""
216-
217-
def bintrayApikey = ""
218-
219-
if (project.rootProject.file('local.properties').exists()) {
220-
221-
Properties properties = new Properties()
222-
223-
properties.load(project.rootProject.file('local.properties').newDataInputStream())
224-
225-
bintrayUsername = properties.getProperty('bintray.user')
226-
227-
bintrayApikey = properties.getProperty('bintray.apikey')
228-
229-
}
230-
231-
configuration = configurations.archives
232-
233-
repositories.mavenDeployer {
234-
235-
pom {
236-
237-
setGroupId project.mavenGroupId
238-
239-
setArtifactId project.mavenArtifactId
240-
241-
setVersion getVersionName()
242-
243-
}
244-
245-
repository (url: project.mavenRepoUrl) {
246-
247-
url = url + "/" + getVersionName()
248-
249-
authentication(
250-
251-
// put these values in local file ~/.gradle/gradle.properties
252-
253-
userName: project.hasProperty("bintrayUsername") ? project.bintrayUsername : bintrayUsername,
254-
255-
password: project.hasProperty("bintrayApikey") ? project.bintrayApikey : bintrayApikey
256-
257-
)
258-
259-
}
260-
261-
}
262-
263-
}
264-
265-
task javadocJar(type: Jar, dependsOn: javadoc) {
266-
classifier = 'javadoc'
267-
from javadoc.destinationDir
268-
}
269-
270213
artifacts {
271214
archives jar
272215
archives sourceJar
273216
archives javadocJar
274217
}
275218

276-
signing {
277-
sign configurations.archives
278-
}
279-
tasks.withType(Sign)*.enabled = mavenCentralPublishingEnabled.toBoolean()
280-
281219
def customizePom(pom) {
282220
pom.withXml {
283221
def root = asNode()

‎gradle/wrapper/gradle-wrapper.jar‎

4.76 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-
#Thu Dec 07 16:02:17 AEDT 2017
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-bin.zip

‎gradlew‎

Lines changed: 33 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
#!/usr/bin/env sh
22

3+
#
4+
# Copyright 2015 the original author or authors.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# https://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
319
##############################################################################
420
##
521
## Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
2844
APP_BASE_NAME=`basename "$0"`
2945

3046
# 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="-Xmx128m -Dfile.encoding=UTF-8"
47+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
3248

3349
# Use the maximum available, or set MAX_FD != -1 to use that value.
3450
MAX_FD="maximum"
@@ -66,6 +82,7 @@ esac
6682

6783
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
6884

85+
6986
# Determine the Java command to use to start the JVM.
7087
if [ -n "$JAVA_HOME" ] ; then
7188
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -109,10 +126,11 @@ if $darwin; then
109126
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
110127
fi
111128

112-
# For Cygwin, switch paths to Windows format before running java
113-
if $cygwin ; then
129+
# For Cygwin or MSYS, switch paths to Windows format before running java
130+
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
114131
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
115132
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
133+
116134
JAVACMD=`cygpath --unix "$JAVACMD"`
117135

118136
# We build the pattern for arguments to be converted via cygpath
@@ -138,19 +156,19 @@ if $cygwin ; then
138156
else
139157
eval `echo args$i`="\"$arg\""
140158
fi
141-
i=$((i+1))
159+
i=`expr $i + 1`
142160
done
143161
case $i in
144-
(0) set -- ;;
145-
(1) set -- "$args0" ;;
146-
(2) set -- "$args0" "$args1" ;;
147-
(3) set -- "$args0" "$args1" "$args2" ;;
148-
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
149-
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
150-
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
151-
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
152-
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
153-
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
162+
0) set -- ;;
163+
1) set -- "$args0" ;;
164+
2) set -- "$args0" "$args1" ;;
165+
3) set -- "$args0" "$args1" "$args2" ;;
166+
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
167+
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
168+
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
169+
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
170+
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
171+
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
154172
esac
155173
fi
156174

@@ -159,14 +177,9 @@ save () {
159177
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160178
echo " "
161179
}
162-
APP_ARGS=$(save "$@")
180+
APP_ARGS=`save "$@"`
163181

164182
# Collect all arguments for the java command, following the shell quoting and substitution rules
165183
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
166184

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
171-
172185
exec "$JAVACMD" "$@"

‎gradlew.bat‎

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
@rem
2+
@rem Copyright 2015 the original author or authors.
3+
@rem
4+
@rem Licensed under the Apache License, Version 2.0 (the "License");
5+
@rem you may not use this file except in compliance with the License.
6+
@rem You may obtain a copy of the License at
7+
@rem
8+
@rem https://www.apache.org/licenses/LICENSE-2.0
9+
@rem
10+
@rem Unless required by applicable law or agreed to in writing, software
11+
@rem distributed under the License is distributed on an "AS IS" BASIS,
12+
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
@rem See the License for the specific language governing permissions and
14+
@rem limitations under the License.
15+
@rem
16+
117
@if "%DEBUG%" == "" @echo off
218
@rem ##########################################################################
319
@rem
@@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=.
1329
set APP_BASE_NAME=%~n0
1430
set APP_HOME=%DIRNAME%
1531

32+
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
33+
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
34+
1635
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17-
set DEFAULT_JVM_OPTS=-Xmx128m -Dfile.encoding=UTF-8
36+
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
1837

1938
@rem Find java.exe
2039
if defined JAVA_HOME goto findJavaFromJavaHome
2140

2241
set JAVA_EXE=java.exe
2342
%JAVA_EXE% -version >NUL 2>&1
24-
if "%ERRORLEVEL%" == "0" goto init
43+
if "%ERRORLEVEL%" == "0" goto execute
2544

2645
echo.
2746
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
3554
set JAVA_HOME=%JAVA_HOME:"=%
3655
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
3756

38-
if exist "%JAVA_EXE%" goto init
57+
if exist "%JAVA_EXE%" goto execute
3958

4059
echo.
4160
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,28 +64,14 @@ echo location of your Java installation.
4564

4665
goto fail
4766

48-
:init
49-
@rem Get command-line arguments, handling Windows variants
50-
51-
if not "%OS%" == "Windows_NT" goto win9xME_args
52-
53-
:win9xME_args
54-
@rem Slurp the command line arguments.
55-
set CMD_LINE_ARGS=
56-
set _SKIP=2
57-
58-
:win9xME_args_slurp
59-
if "x%~1" == "x" goto execute
60-
61-
set CMD_LINE_ARGS=%*
62-
6367
:execute
6468
@rem Setup the command line
6569

6670
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
6771

72+
6873
@rem Execute Gradle
69-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
74+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
7075

7176
:end
7277
@rem End local scope for the variables with windows NT shell

0 commit comments

Comments
 (0)