Skip to content

Commit 9256135

Browse files
baywetbaywet
committed
- upgrades gradle from 4.5 to 6.6
1 parent b04bbb7 commit 9256135

File tree

6 files changed

+94
-143
lines changed

6 files changed

+94
-143
lines changed

‎build.gradle‎

Lines changed: 34 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
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'
16-
apply plugin: 'jacoco'
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+
id 'jacoco'
17+
}
1718

1819
// In this section you declare where to find the dependencies of your project
1920
repositories {
@@ -33,7 +34,7 @@ dependencies {
3334
api 'com.squareup.okhttp3:okhttp:3.12.1'
3435

3536
// https://mvnrepository.com/artifact/com.googlecode.json-simple/json-simple
36-
compile group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1'
37+
implementation group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1'
3738
}
3839

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

5570
publishing {
5671

@@ -67,6 +82,7 @@ publishing {
6782
from components.java
6883

6984
artifact sourceJar
85+
artifact javadocJar
7086
pom.withXml {
7187
def root = asNode()
7288
root.appendNode('name', 'Microsoft Graph Core SDK for Java')
@@ -87,12 +103,8 @@ publishing {
87103
def pomFile = file("${project.buildDir}/generated-pom.xml")
88104
writeTo(pomFile)
89105
}
90-
artifact(sourceJar) {
91-
classifier = 'sources'
92-
}
93-
artifact(javadocJar) {
94-
classifier = 'javadoc'
95-
}
106+
artifact sourceJar
107+
artifact javadocJar
96108
}
97109

98110
mavenCentralRelease(MavenPublication) {
@@ -110,12 +122,8 @@ publishing {
110122
extension = 'pom.asc'
111123
}
112124
}
113-
artifact(sourceJar) {
114-
classifier = 'sources'
115-
}
116-
artifact(javadocJar) {
117-
classifier = 'javadoc'
118-
}
125+
artifact sourceJar
126+
artifact javadocJar
119127
project.tasks.signArchives.signatureFiles.each {
120128
artifact(it) {
121129
def matcher = it.file =~ /-(sources|javadoc)\.jar\.asc$/
@@ -188,14 +196,9 @@ publishing {
188196

189197
}
190198

191-
task sourceJar(type: Jar) {
192-
classifier = 'sources'
193-
from sourceSets.main.allJava
194-
}
195-
196199
compileJava {
197-
sourceCompatibility = 1.7
198-
targetCompatibility = 1.7
200+
sourceCompatibility = 1.8
201+
targetCompatibility = 1.8
199202
}
200203

201204
def getVersionCode() {
@@ -206,74 +209,12 @@ def getVersionName() {
206209
return "${mavenMajorVersion}.${mavenMinorVersion}.${mavenPatchVersion}${mavenArtifactSuffix}"
207210
}
208211

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

272-
signing {
273-
sign configurations.archives
274-
}
275-
tasks.withType(Sign)*.enabled = mavenCentralPublishingEnabled.toBoolean()
276-
277218
def customizePom(pom) {
278219
pom.withXml {
279220
def root = asNode()

‎gradle/wrapper/gradle-wrapper.jar‎

4.32 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip
34
zipStoreBase=GRADLE_USER_HOME
45
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-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=""
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=
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)