preparing release

kotlin-graphics · Feb 27, 2019 · 1208b25 · 1208b25
1 parent f09cfe6
commit 1208b25
Show file tree

Hide file tree

Showing 14 changed files with 70 additions and 68 deletions.
diff --git a/...aries/Gradle__com_github_kotlin_graphics_gli_42d5ecff1637632c823e230ae5cf3b618051e40f.xml b/...aries/Gradle__com_github_kotlin_graphics_gli_42d5ecff1637632c823e230ae5cf3b618051e40f.xml
diff --git a/...aries/Gradle__com_github_kotlin_graphics_gli_968eb79758bf3475e8cf1a93f138b2a19aadd7a5.xml b/...aries/Gradle__com_github_kotlin_graphics_gli_968eb79758bf3475e8cf1a93f138b2a19aadd7a5.xml
diff --git a/...s/Gradle__com_github_kotlin_graphics_glm_glm_3c1bc0717a13de4ea9920355462eaed83ed45127.xml b/...s/Gradle__com_github_kotlin_graphics_glm_glm_3c1bc0717a13de4ea9920355462eaed83ed45127.xml
diff --git a/...s/Gradle__com_github_kotlin_graphics_glm_glm_a1cafbd4e1bda500291b19a8d0cb75374f97688c.xml b/...s/Gradle__com_github_kotlin_graphics_glm_glm_a1cafbd4e1bda500291b19a8d0cb75374f97688c.xml
diff --git a/...ries/Gradle__com_github_kotlin_graphics_kool_7c3dfaf417b00a0b7fe5dd273bf10291ebfe45d0.xml b/...ries/Gradle__com_github_kotlin_graphics_kool_7c3dfaf417b00a0b7fe5dd273bf10291ebfe45d0.xml
diff --git a/...ries/Gradle__com_github_kotlin_graphics_kool_8d4292e2e2091ab7dfab7bbb66c4775229168df7.xml b/...ries/Gradle__com_github_kotlin_graphics_kool_8d4292e2e2091ab7dfab7bbb66c4775229168df7.xml
diff --git a/...__com_github_kotlin_graphics_kotlin_unsigned_0e3cc3ec155986f2100fee03cc143cbd3dfd0d84.xml b/...__com_github_kotlin_graphics_kotlin_unsigned_0e3cc3ec155986f2100fee03cc143cbd3dfd0d84.xml
diff --git a/...__com_github_kotlin_graphics_kotlin_unsigned_6ba3af41713dba2d271043311ae947b8a41a42a3.xml b/...__com_github_kotlin_graphics_kotlin_unsigned_6ba3af41713dba2d271043311ae947b8a41a42a3.xml
diff --git a/...etbrains_kotlin_kotlin_reflect_1_3_11.xml → ...etbrains_kotlin_kotlin_reflect_1_3_21.xml b/...etbrains_kotlin_kotlin_reflect_1_3_11.xml → ...etbrains_kotlin_kotlin_reflect_1_3_21.xml
diff --git a/...jetbrains_kotlin_kotlin_stdlib_1_3_11.xml → ...jetbrains_kotlin_kotlin_stdlib_1_3_21.xml b/...jetbrains_kotlin_kotlin_stdlib_1_3_11.xml → ...jetbrains_kotlin_kotlin_stdlib_1_3_21.xml
diff --git a/...ns_kotlin_kotlin_stdlib_common_1_3_11.xml → ...ns_kotlin_kotlin_stdlib_common_1_3_21.xml b/...ns_kotlin_kotlin_stdlib_common_1_3_11.xml → ...ns_kotlin_kotlin_stdlib_common_1_3_21.xml
diff --git a/build.gradle b/build.gradle
@@ -4,9 +4,9 @@ plugins {
     id 'maven'
     id 'java'
     id 'java-library'
-    id "org.jetbrains.kotlin.jvm" version "1.3.11"
+    id "org.jetbrains.kotlin.jvm" version "1.3.21"
 //    id "org.jetbrains.kotlin.kapt" version "1.3.10"
-    id "com.github.johnrengelman.shadow" version '4.0.3'
+    id "com.github.johnrengelman.shadow" version '4.0.4'
 }
 
 // jitpack
@@ -16,7 +16,7 @@ ext{
     moduleName = 'com.github.kotlin_graphics.vkk'
     kotlin = 'org.jetbrains.kotlin:kotlin'
     kotlin_version = '1.3.21'
-    gli_version = '42d5ecff1637632c823e230ae5cf3b618051e40f'
+    gli_version = '968eb79758bf3475e8cf1a93f138b2a19aadd7a5'
     lwjgl_version = "3.2.2-SNAPSHOT"
     lwjgl_natives = current() == WINDOWS ? "windows" : current() == LINUX ? "linux" : "macos"
     sprivCross_version = "0.5.0-1.1.85"
@@ -49,12 +49,12 @@ repositories {
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
+    archiveClassifier = 'sources'
     from sourceSets.main.allSource
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
+    archiveClassifier = 'javadoc'
     from javadoc.destinationDir
 }
 
@@ -66,4 +66,6 @@ artifacts {
 jar {
     inputs.property("moduleName", moduleName)
     manifest.attributes('Automatic-Module-Name': moduleName)
-}
+}
+
+shadowJar.archiveClassifier = 'all'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip