From ab3dc6c2fab41910ae49b63bb0acb03ab9ca2175 Mon Sep 17 00:00:00 2001
From: Mike Sinkovsky <msink@permonline.ru>
Date: Thu, 31 Oct 2019 13:49:48 +0500
Subject: [PATCH] Kotlin 1.3.60

---
 .travis.yml                              |  7 ++++---
 CHANGELOG.md                             |  7 +++++++
 build.gradle.kts                         |  2 +-
 buildSrc/src/main/kotlin/Versions.kt     |  5 ++---
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 libui/build.gradle.kts                   | 19 +++++++------------
 settings.gradle.kts                      |  2 +-
 7 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 45573ecc..e4145f7a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,14 +3,15 @@ language: java
 matrix:
   include:
     - os: linux
-      dist: trusty
-      jdk: oraclejdk8
+      dist: bionic
+      jdk: oraclejdk11
       addons:
         apt:
           packages:
             - libgtk-3-dev
     - os: osx
-      osx_image: xcode10.2
+      osx_image: xcode11
+      jdk: oraclejdk11
 
 script:
   - ./gradlew -PpublishMode build
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1cdeca4..39d8cafc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# 0.1.6
+> Published 18 Nov 2019
+
+* Compatible with Kotlin 1.3.60
+* On macOS requires Xcode 11 or higher
+
+
 # 0.1.5
 > Published 22 Aug 2019
 
diff --git a/build.gradle.kts b/build.gradle.kts
index c6dd0597..da8ba815 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -9,8 +9,8 @@ plugins {
 
 allprojects {
     repositories {
-        if (Kotlin.repo.isNotEmpty()) maven { url = uri(Kotlin.repo) }
         mavenCentral()
+        maven { url = uri("https://dl.bintray.com/kotlin/kotlin-dev") }
     }
 }
 
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index 59a3876c..7ad3bc2b 100644
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -11,8 +11,7 @@ object Publish {
 }
 
 object Kotlin {
-    const val version = "1.3.50"
-    const val repo = "https://dl.bintray.com/kotlin/kotlin-dev"
+    const val version = "1.3.60"
 }
 
 object Libui {
@@ -25,5 +24,5 @@ object Dokka {
 }
 
 object Download {
-    const val version = "3.4.3"
+    const val version = "4.0.1"
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index dbe85eef..0ebb3108 100644
--- 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.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/libui/build.gradle.kts b/libui/build.gradle.kts
index b6286182..29b8343b 100644
--- a/libui/build.gradle.kts
+++ b/libui/build.gradle.kts
@@ -63,20 +63,16 @@ kotlin {
     }
 }
 
-tasks.withType<CInteropProcess>().all {
+tasks.withType<CInteropProcess> {
     dependsOn(unpackArchive)
 }
 
 publishing {
-    publications.withType<MavenPublication>().all {
+    publications.withType<MavenPublication> {
         pom {
-            withXml {
-                asNode().apply {
-                    appendNode("name", "libui")
-                    appendNode("description", "Kotlin/Native interop to libui: a portable GUI library")
-                    appendNode("url", Publish.pom.url)
-                }
-            }
+            name.set("libui")
+            description.set("Kotlin/Native interop to libui: a portable GUI library")
+            url.set(Publish.pom.url)
             licenses {
                 license {
                     name.set("MIT License")
@@ -104,8 +100,7 @@ publishing {
     }
 
     repositories {
-        maven {
-            url = uri("https://api.bintray.com/maven/${Publish.user}/$BINTRAY_REPO/libui/;publish=0;override=1")
+        maven("https://api.bintray.com/maven/${Publish.user}/$BINTRAY_REPO/libui/;publish=0;override=1") {
             credentials {
                 username = Publish.user
                 password = System.getenv("BINTRAY_API_KEY")
@@ -114,7 +109,7 @@ publishing {
     }
 }
 
-tasks.withType<AbstractPublishToMaven>().all {
+tasks.withType<AbstractPublishToMaven> {
     onlyIf { !name.startsWith("publishWindows") || os.isWindows }
     onlyIf { !name.startsWith("publishMacosx") || os.isMacOsX }
     onlyIf { !name.startsWith("publishLinux") || os.isLinux }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 4471165e..ab0506d5 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -11,9 +11,9 @@ pluginManagement {
     }
 
     repositories {
-        if (Kotlin.repo.isNotEmpty()) maven { url = uri(Kotlin.repo) }
         mavenCentral()
         maven { url = uri("https://plugins.gradle.org/m2/") }
+        maven { url = uri("https://dl.bintray.com/kotlin/kotlin-dev") }
     }
 }