Skip to content

Commit

Permalink
kotlinbukkit 1.0.0-rc.8 - Minecraft 1.14.4, Kotlin 1.3.50, and more
Browse files Browse the repository at this point in the history
  • Loading branch information
finalchild committed Jan 3, 2020
1 parent c1cf9b0 commit 7228d8e
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 35 deletions.
2 changes: 1 addition & 1 deletion .bintraydescriptor.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"subject": "finalchild"
},
"version": {
"name": "1.0.0-rc.7",
"name": "1.0.0-rc.8",
"gpgSign": true
},
"files": [
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: java
jdk:
- openjdk12
- openjdk13
before_deploy: "./gradlew prepareUpload"
deploy:
- provider: releases
Expand Down
21 changes: 10 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,14 @@
*/

plugins {
id 'org.jetbrains.kotlin.jvm' version '1.3.41'
id 'com.github.johnrengelman.shadow' version '5.0.0'
id 'org.jetbrains.kotlin.jvm' version '1.3.50'
id 'com.github.johnrengelman.shadow' version '5.2.0'
id 'java-library'
id 'maven'
id 'maven-publish'
}

group 'me.finalchild'
version '1.0.0-rc.7'
version '1.0.0-rc.8'

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

Expand All @@ -40,13 +39,13 @@ repositories {
}

dependencies {
compile(group: 'com.destroystokyo.paper', name: 'paper-api', version: '1.14.3-R0.1-SNAPSHOT') {
api(group: 'com.destroystokyo.paper', name: 'paper-api', version: '1.14.4-R0.1-SNAPSHOT') {
exclude group: 'junit', module: 'junit'
}
compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk8'
api group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk8'
}

sourceCompatibility = 12
sourceCompatibility = 13

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

tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '12'
}
}

Expand Down Expand Up @@ -157,7 +156,7 @@ def pomConfig = {

publishing {
publications {
MyPublication(MavenPublication) {
maven(MavenPublication) {
from components.java
afterEvaluate {
artifact shadowJar
Expand All @@ -175,12 +174,12 @@ publishing {
}

model {
tasks.generatePomFileForMyPublicationPublication {
tasks.generatePomFileForMavenPublication {
destination = file("${buildDir}/libs/${project.name}-${project.version}.pom")
}
}

task prepareUpload(type: Copy, dependsOn: ['build', 'generatePomFileForMyPublicationPublication']) {
task prepareUpload(type: Copy, dependsOn: ['build', 'generatePomFileForMavenPublication']) {
from 'build/libs'
into "build/upload/me/finalchild/${project.name}/${project.version}"
include "kotlinbukkit-${project.version}.jar"
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
35 changes: 15 additions & 20 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
Expand Down Expand Up @@ -125,8 +125,8 @@ if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi

# For Cygwin, switch paths to Windows format before running java
if $cygwin ; then
# For Cygwin or MSYS, switch paths to Windows format before running java
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
Expand Down Expand Up @@ -154,19 +154,19 @@ if $cygwin ; then
else
eval `echo args$i`="\"$arg\""
fi
i=$((i+1))
i=`expr $i + 1`
done
case $i in
(0) set -- ;;
(1) set -- "$args0" ;;
(2) set -- "$args0" "$args1" ;;
(3) set -- "$args0" "$args1" "$args2" ;;
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
0) set -- ;;
1) set -- "$args0" ;;
2) set -- "$args0" "$args1" ;;
3) set -- "$args0" "$args1" "$args2" ;;
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi

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

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

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

exec "$JAVACMD" "$@"
2 changes: 1 addition & 1 deletion gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem http://www.apache.org/licenses/LICENSE-2.0
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
Expand Down

0 comments on commit 7228d8e

Please sign in to comment.