kotlinbukkit 1.0.0-rc.6 - Kotlin 1.3.30 and more

finalchild · Jan 3, 2020 · 9cc0212 · 9cc0212
1 parent b086ace
commit 9cc0212
Show file tree

Hide file tree

Showing 22 changed files with 69 additions and 37 deletions.
diff --git a/.bintraydescriptor.json b/.bintraydescriptor.json
@@ -5,7 +5,7 @@
     "subject": "finalchild"
   },
   "version": {
-    "name": "1.0.0-rc.5",
+    "name": "1.0.0-rc.6",
     "gpgSign": true
   },
   "files": [

diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: java
 jdk:
-- openjdk11
+- openjdk12
 before_deploy: "./gradlew prepareUpload"
 deploy:
 - provider: releases

diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 Bak Jaeon (finalchild) and Ranol
+ * Copyright 2017-2019 Bak Jaeon (finalchild) and Ranol
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,15 +15,15 @@
  */
 
 plugins {
-    id 'org.jetbrains.kotlin.jvm' version '1.3.20'
-    id 'com.github.johnrengelman.shadow' version '4.0.4'
+    id 'org.jetbrains.kotlin.jvm' version '1.3.30'
+    id 'com.github.johnrengelman.shadow' version '5.0.0'
     id 'java-library'
     id 'maven'
     id 'maven-publish'
 }
 
 group 'me.finalchild'
-version '1.0.0-rc.5'
+version '1.0.0-rc.6'
 
 description 'Provides Kotlin stdlib and extensions to Bukkit plugins.'
 
@@ -46,7 +46,7 @@ dependencies {
     compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk8'
 }
 
-sourceCompatibility = 11
+sourceCompatibility = 12
 
 tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
@@ -95,7 +95,7 @@ shadowJar {
         exclude dependency(group: 'org.ow2.asm', name: 'asm-tree')
         exclude dependency(group: 'org.ow2.asm', name: 'asm')
     }
-    classifier = 'uber'
+    archiveClassifier = 'uber'
 }
 
 task sourcesJar(type: Jar) {

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# 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
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m"'
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

diff --git a/gradlew.bat b/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@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
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m"
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

diff --git a/settings.gradle b/settings.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 Bak Jaeon (finalchild) and Ranol
+ * Copyright 2017-2019 Bak Jaeon (finalchild) and Ranol
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/kotlin/me/finalchild/kotlinbukkit/KotlinBukkit.kt b/src/main/kotlin/me/finalchild/kotlinbukkit/KotlinBukkit.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 Bak Jaeon (finalchild) and Ranol
+ * Copyright 2017-2019 Bak Jaeon (finalchild) and Ranol
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/kotlin/me/finalchild/kotlinbukkit/updater/LatestReleaseChecker.kt b/src/main/kotlin/me/finalchild/kotlinbukkit/updater/LatestReleaseChecker.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 Bak Jaeon (finalchild) and Ranol
+ * Copyright 2017-2019 Bak Jaeon (finalchild) and Ranol
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/kotlin/me/finalchild/kotlinbukkit/updater/ReleaseInfo.kt b/src/main/kotlin/me/finalchild/kotlinbukkit/updater/ReleaseInfo.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 Bak Jaeon (finalchild) and Ranol
+ * Copyright 2017-2019 Bak Jaeon (finalchild) and Ranol
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/kotlin/me/finalchild/kotlinbukkit/util/AttributeUtil.kt b/src/main/kotlin/me/finalchild/kotlinbukkit/util/AttributeUtil.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 Bak Jaeon (finalchild) and Ranol
+ * Copyright 2017-2019 Bak Jaeon (finalchild) and Ranol
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ import org.bukkit.attribute.AttributeModifier
  * @param attribute the attribute to get
  * @return the attribute instance or null if not applicable to this object
  */
-operator fun Attributable.get(attribute: Attribute): AttributeInstance = getAttribute(attribute)
+operator fun Attributable.get(attribute: Attribute): AttributeInstance? = getAttribute(attribute)
 
 /**
  * Add a modifier to this instance.

diff --git a/src/main/kotlin/me/finalchild/kotlinbukkit/util/ChatUtil.kt b/src/main/kotlin/me/finalchild/kotlinbukkit/util/ChatUtil.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 Bak Jaeon (finalchild) and Ranol
+ * Copyright 2017-2019 Bak Jaeon (finalchild) and Ranol
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/kotlin/me/finalchild/kotlinbukkit/util/CommandUtil.kt b/src/main/kotlin/me/finalchild/kotlinbukkit/util/CommandUtil.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 Bak Jaeon (finalchild) and Ranol
+ * Copyright 2017-2019 Bak Jaeon (finalchild) and Ranol
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/kotlin/me/finalchild/kotlinbukkit/util/ConfigUtil.kt b/src/main/kotlin/me/finalchild/kotlinbukkit/util/ConfigUtil.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 Bak Jaeon (finalchild) and Ranol
+ * Copyright 2017-2019 Bak Jaeon (finalchild) and Ranol
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/kotlin/me/finalchild/kotlinbukkit/util/EnchantmentUtil.kt b/src/main/kotlin/me/finalchild/kotlinbukkit/util/EnchantmentUtil.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 Bak Jaeon (finalchild) and Ranol
+ * Copyright 2017-2019 Bak Jaeon (finalchild) and Ranol
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/kotlin/me/finalchild/kotlinbukkit/util/InventoryUtil.kt b/src/main/kotlin/me/finalchild/kotlinbukkit/util/InventoryUtil.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 Bak Jaeon (finalchild) and Ranol
+ * Copyright 2017-2019 Bak Jaeon (finalchild) and Ranol
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/kotlin/me/finalchild/kotlinbukkit/util/ItemStackUtil.kt b/src/main/kotlin/me/finalchild/kotlinbukkit/util/ItemStackUtil.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 Bak Jaeon (finalchild) and Ranol
+ * Copyright 2017-2019 Bak Jaeon (finalchild) and Ranol
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@ var ItemStack.displayName: String?
     set(name) {
         val itemMeta = this.itemMeta
         if (itemMeta != null) {
-            itemMeta.displayName = name
+            itemMeta.setDisplayName(name)
             this.itemMeta = itemMeta
         } else {
             throw UnsupportedOperationException("No ItemMeta for the item ${this} found.")
@@ -57,7 +57,7 @@ var ItemStack.name: String?
     set(name) {
         val itemMeta = this.itemMeta
         if (itemMeta != null) {
-            itemMeta.displayName = name
+            itemMeta.setDisplayName(name)
             this.itemMeta = itemMeta
         } else {
             throw UnsupportedOperationException("No ItemMeta for the item ${this} found.")
@@ -79,7 +79,7 @@ var ItemStack.localizedName: String?
     set(name) {
         val itemMeta = this.itemMeta
         if (itemMeta != null) {
-            itemMeta.localizedName = name
+            itemMeta.setLocalizedName(name)
             this.itemMeta = itemMeta
         } else {
             throw UnsupportedOperationException("No ItemMeta for the item ${this} found.")

diff --git a/src/main/kotlin/me/finalchild/kotlinbukkit/util/MaterialUtil.kt b/src/main/kotlin/me/finalchild/kotlinbukkit/util/MaterialUtil.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 Bak Jaeon (finalchild) and Ranol
+ * Copyright 2017-2019 Bak Jaeon (finalchild) and Ranol
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/kotlin/me/finalchild/kotlinbukkit/util/Util.kt b/src/main/kotlin/me/finalchild/kotlinbukkit/util/Util.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 Bak Jaeon (finalchild) and Ranol
+ * Copyright 2017-2019 Bak Jaeon (finalchild) and Ranol
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/kotlin/me/finalchild/kotlinbukkit/util/VectorUtil.kt b/src/main/kotlin/me/finalchild/kotlinbukkit/util/VectorUtil.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 Bak Jaeon (finalchild) and Ranol
+ * Copyright 2017-2019 Bak Jaeon (finalchild) and Ranol
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,16 +18,16 @@ package me.finalchild.kotlinbukkit.util
 
 import org.bukkit.util.Vector
 
-operator fun Vector.plus(b: Vector) = clone().add(b)!!
-operator fun Vector.minus(b: Vector) = clone().subtract(b)!!
+operator fun Vector.plus(b: Vector) = clone().add(b)
+operator fun Vector.minus(b: Vector) = clone().subtract(b)
 
 operator fun Vector.unaryPlus() = clone()
-operator fun Vector.unaryMinus() = clone().multiply(-1)!!
+operator fun Vector.unaryMinus() = clone().multiply(-1)
 
-operator fun Vector.times(b: Int) = clone().multiply(b)!!
-operator fun Vector.times(b: Float) = clone().multiply(b)!!
-operator fun Vector.times(b: Double) = clone().multiply(b)!!
-operator fun Vector.times(b: Vector) = clone().multiply(b)!!
+operator fun Vector.times(b: Int) = clone().multiply(b)
+operator fun Vector.times(b: Float) = clone().multiply(b)
+operator fun Vector.times(b: Double) = clone().multiply(b)
+operator fun Vector.times(b: Vector) = clone().multiply(b)
 
 operator fun Vector.component1() = x
 operator fun Vector.component2() = y

diff --git a/src/main/kotlin/me/finalchild/kotlinbukkit/util/WorldUtil.kt b/src/main/kotlin/me/finalchild/kotlinbukkit/util/WorldUtil.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 Bak Jaeon (finalchild) and Ranol
+ * Copyright 2017-2019 Bak Jaeon (finalchild) and Ranol
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.