Skip to content

Commit 2b7da63

Browse files
derveloperderveloper
committed
update gradle
1 parent c23c621 commit 2b7da63

File tree

5 files changed

+70
-73
lines changed

5 files changed

+70
-73
lines changed

‎build.gradle

+10-46
Original file line numberDiff line numberDiff line change
@@ -17,47 +17,12 @@ buildscript {
1717

1818
apply plugin: 'kotlin'
1919
apply plugin: 'com.jfrog.bintray'
20-
apply plugin: 'maven'
2120
apply plugin: 'maven-publish'
2221

2322
repositories {
2423
mavenCentral()
2524
}
2625

27-
install {
28-
repositories.mavenInstaller {
29-
pom.project {
30-
name 'kotlin-openapi3-dsl'
31-
description 'Build your OpenApi3 spec in kotlin!'
32-
url 'https://github.com/derveloper/kotlin-openapi3-dsl'
33-
inceptionYear '2017'
34-
35-
packaging 'jar'
36-
groupId 'cc.vileda'
37-
artifactId 'kotlin-openapi3-dsl'
38-
version "$version"
39-
40-
licenses {
41-
license {
42-
name 'The Apache Software License, Version 2.0'
43-
url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
44-
distribution 'repo'
45-
}
46-
}
47-
scm {
48-
connection 'https://github.com/derveloper/kotlin-openapi3-dsl.git'
49-
url 'https://github.com/derveloper/kotlin-openapi3-dsl'
50-
51-
}
52-
developers {
53-
developer {
54-
name 'Tristan Leo'
55-
}
56-
}
57-
}
58-
}
59-
}
60-
6126
def pomConfig = {
6227
licenses {
6328
license {
@@ -118,7 +83,6 @@ publishing {
11883
bintray {
11984
user = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : (System.getenv('BINTRAY_USER') != null ? System.getenv('BINTRAY_USER') : "")
12085
key = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : (System.getenv('BINTRAY_API_KEY') != null ? System.getenv('BINTRAY_API_KEY') : "")
121-
//configurations = ['archives']
12286
publications = ['mavenJava']
12387
publish = true
12488
pkg {
@@ -148,16 +112,16 @@ test {
148112
}
149113

150114
dependencies {
151-
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
152-
compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: "$jackson_version"
153-
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "$jackson_version"
154-
compile "com.fasterxml.jackson.module:jackson-module-jsonSchema:$jackson_version"
155-
compile "com.fasterxml.jackson.datatype:jackson-datatype-json-org:$jackson_version"
156-
compile group: 'com.reprezen.kaizen', name: 'openapi-parser', version: '4.0.4'
157-
compile 'io.swagger.core.v3:swagger-core:2.0.8'
158-
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
159-
testCompile 'io.kotlintest:kotlintest-runner-junit5:3.4.0'
160-
testCompile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.28'
115+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
116+
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: "$jackson_version"
117+
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "$jackson_version"
118+
implementation "com.fasterxml.jackson.module:jackson-module-jsonSchema:$jackson_version"
119+
implementation "com.fasterxml.jackson.datatype:jackson-datatype-json-org:$jackson_version"
120+
implementation group: 'com.reprezen.kaizen', name: 'openapi-parser', version: '4.0.4'
121+
implementation 'io.swagger.core.v3:swagger-core:2.0.8'
122+
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
123+
testImplementation 'io.kotlintest:kotlintest-runner-junit5:3.4.0'
124+
testImplementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.28'
161125
}
162126

163127
compileKotlin {

‎gradle/wrapper/gradle-wrapper.jar

4.03 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Oct 30 23:02:41 CET 2017
1+
#Thu Jun 04 11:29:55 CEST 2020
2+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
23
distributionBase=GRADLE_USER_HOME
34
distributionPath=wrapper/dists
4-
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-all.zip
6+
zipStoreBase=GRADLE_USER_HOME

‎gradlew

+36-23
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,16 +44,16 @@ 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"
3551

36-
warn ( ) {
52+
warn () {
3753
echo "$*"
3854
}
3955

40-
die ( ) {
56+
die () {
4157
echo
4258
echo "$*"
4359
echo
@@ -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,35 +156,30 @@ 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

157175
# Escape application args
158-
save ( ) {
176+
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

+21-1
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,8 +29,11 @@ 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
@@ -65,6 +84,7 @@ set CMD_LINE_ARGS=%*
6584

6685
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
6786

87+
6888
@rem Execute Gradle
6989
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
7090

0 commit comments

Comments
 (0)