Skip to content

Commit 7228d8e

Browse files
committed
kotlinbukkit 1.0.0-rc.8 - Minecraft 1.14.4, Kotlin 1.3.50, and more
1 parent c1cf9b0 commit 7228d8e

File tree

7 files changed

+29
-35
lines changed

7 files changed

+29
-35
lines changed

.bintraydescriptor.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"subject": "finalchild"
66
},
77
"version": {
8-
"name": "1.0.0-rc.7",
8+
"name": "1.0.0-rc.8",
99
"gpgSign": true
1010
},
1111
"files": [

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: java
22
jdk:
3-
- openjdk12
3+
- openjdk13
44
before_deploy: "./gradlew prepareUpload"
55
deploy:
66
- provider: releases

build.gradle

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,14 @@
1515
*/
1616

1717
plugins {
18-
id 'org.jetbrains.kotlin.jvm' version '1.3.41'
19-
id 'com.github.johnrengelman.shadow' version '5.0.0'
18+
id 'org.jetbrains.kotlin.jvm' version '1.3.50'
19+
id 'com.github.johnrengelman.shadow' version '5.2.0'
2020
id 'java-library'
21-
id 'maven'
2221
id 'maven-publish'
2322
}
2423

2524
group 'me.finalchild'
26-
version '1.0.0-rc.7'
25+
version '1.0.0-rc.8'
2726

2827
description 'Provides Kotlin stdlib and extensions to Bukkit plugins.'
2928

@@ -40,13 +39,13 @@ repositories {
4039
}
4140

4241
dependencies {
43-
compile(group: 'com.destroystokyo.paper', name: 'paper-api', version: '1.14.3-R0.1-SNAPSHOT') {
42+
api(group: 'com.destroystokyo.paper', name: 'paper-api', version: '1.14.4-R0.1-SNAPSHOT') {
4443
exclude group: 'junit', module: 'junit'
4544
}
46-
compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk8'
45+
api group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk8'
4746
}
4847

49-
sourceCompatibility = 12
48+
sourceCompatibility = 13
5049

5150
tasks.withType(JavaCompile) {
5251
options.encoding = 'UTF-8'
@@ -66,7 +65,7 @@ compileKotlin.destinationDir = compileJava.destinationDir
6665

6766
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
6867
kotlinOptions {
69-
jvmTarget = '1.8'
68+
jvmTarget = '12'
7069
}
7170
}
7271

@@ -157,7 +156,7 @@ def pomConfig = {
157156

158157
publishing {
159158
publications {
160-
MyPublication(MavenPublication) {
159+
maven(MavenPublication) {
161160
from components.java
162161
afterEvaluate {
163162
artifact shadowJar
@@ -175,12 +174,12 @@ publishing {
175174
}
176175

177176
model {
178-
tasks.generatePomFileForMyPublicationPublication {
177+
tasks.generatePomFileForMavenPublication {
179178
destination = file("${buildDir}/libs/${project.name}-${project.version}.pom")
180179
}
181180
}
182181

183-
task prepareUpload(type: Copy, dependsOn: ['build', 'generatePomFileForMyPublicationPublication']) {
182+
task prepareUpload(type: Copy, dependsOn: ['build', 'generatePomFileForMavenPublication']) {
184183
from 'build/libs'
185184
into "build/upload/me/finalchild/${project.name}/${project.version}"
186185
include "kotlinbukkit-${project.version}.jar"

gradle/wrapper/gradle-wrapper.jar

3.01 KB
Binary file not shown.
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-5.3.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# you may not use this file except in compliance with the License.
88
# You may obtain a copy of the License at
99
#
10-
# http://www.apache.org/licenses/LICENSE-2.0
10+
# https://www.apache.org/licenses/LICENSE-2.0
1111
#
1212
# Unless required by applicable law or agreed to in writing, software
1313
# distributed under the License is distributed on an "AS IS" BASIS,
@@ -125,8 +125,8 @@ if $darwin; then
125125
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
126126
fi
127127

128-
# For Cygwin, switch paths to Windows format before running java
129-
if $cygwin ; then
128+
# For Cygwin or MSYS, switch paths to Windows format before running java
129+
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
130130
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
131131
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
132132
JAVACMD=`cygpath --unix "$JAVACMD"`
@@ -154,19 +154,19 @@ if $cygwin ; then
154154
else
155155
eval `echo args$i`="\"$arg\""
156156
fi
157-
i=$((i+1))
157+
i=`expr $i + 1`
158158
done
159159
case $i in
160-
(0) set -- ;;
161-
(1) set -- "$args0" ;;
162-
(2) set -- "$args0" "$args1" ;;
163-
(3) set -- "$args0" "$args1" "$args2" ;;
164-
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
165-
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
166-
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
167-
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
168-
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
169-
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
160+
0) set -- ;;
161+
1) set -- "$args0" ;;
162+
2) set -- "$args0" "$args1" ;;
163+
3) set -- "$args0" "$args1" "$args2" ;;
164+
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
165+
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
166+
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
167+
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
168+
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
169+
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
170170
esac
171171
fi
172172

@@ -175,14 +175,9 @@ save () {
175175
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
176176
echo " "
177177
}
178-
APP_ARGS=$(save "$@")
178+
APP_ARGS=`save "$@"`
179179

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

183-
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
184-
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
185-
cd "$(dirname "$0")"
186-
fi
187-
188183
exec "$JAVACMD" "$@"

gradlew.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
@rem you may not use this file except in compliance with the License.
66
@rem You may obtain a copy of the License at
77
@rem
8-
@rem http://www.apache.org/licenses/LICENSE-2.0
8+
@rem https://www.apache.org/licenses/LICENSE-2.0
99
@rem
1010
@rem Unless required by applicable law or agreed to in writing, software
1111
@rem distributed under the License is distributed on an "AS IS" BASIS,

0 commit comments

Comments
 (0)