Skip to content

Commit ab3dc6c

Browse files
committed
Kotlin 1.3.60
1 parent e20680b commit ab3dc6c

File tree

7 files changed

+23
-21
lines changed

7 files changed

+23
-21
lines changed

.travis.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@ language: java
33
matrix:
44
include:
55
- os: linux
6-
dist: trusty
7-
jdk: oraclejdk8
6+
dist: bionic
7+
jdk: oraclejdk11
88
addons:
99
apt:
1010
packages:
1111
- libgtk-3-dev
1212
- os: osx
13-
osx_image: xcode10.2
13+
osx_image: xcode11
14+
jdk: oraclejdk11
1415

1516
script:
1617
- ./gradlew -PpublishMode build

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# 0.1.6
2+
> Published 18 Nov 2019
3+
4+
* Compatible with Kotlin 1.3.60
5+
* On macOS requires Xcode 11 or higher
6+
7+
18
# 0.1.5
29
> Published 22 Aug 2019
310

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ plugins {
99

1010
allprojects {
1111
repositories {
12-
if (Kotlin.repo.isNotEmpty()) maven { url = uri(Kotlin.repo) }
1312
mavenCentral()
13+
maven { url = uri("https://dl.bintray.com/kotlin/kotlin-dev") }
1414
}
1515
}
1616

buildSrc/src/main/kotlin/Versions.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ object Publish {
1111
}
1212

1313
object Kotlin {
14-
const val version = "1.3.50"
15-
const val repo = "https://dl.bintray.com/kotlin/kotlin-dev"
14+
const val version = "1.3.60"
1615
}
1716

1817
object Libui {
@@ -25,5 +24,5 @@ object Dokka {
2524
}
2625

2726
object Download {
28-
const val version = "3.4.3"
27+
const val version = "4.0.1"
2928
}
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.6.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

libui/build.gradle.kts

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -63,20 +63,16 @@ kotlin {
6363
}
6464
}
6565

66-
tasks.withType<CInteropProcess>().all {
66+
tasks.withType<CInteropProcess> {
6767
dependsOn(unpackArchive)
6868
}
6969

7070
publishing {
71-
publications.withType<MavenPublication>().all {
71+
publications.withType<MavenPublication> {
7272
pom {
73-
withXml {
74-
asNode().apply {
75-
appendNode("name", "libui")
76-
appendNode("description", "Kotlin/Native interop to libui: a portable GUI library")
77-
appendNode("url", Publish.pom.url)
78-
}
79-
}
73+
name.set("libui")
74+
description.set("Kotlin/Native interop to libui: a portable GUI library")
75+
url.set(Publish.pom.url)
8076
licenses {
8177
license {
8278
name.set("MIT License")
@@ -104,8 +100,7 @@ publishing {
104100
}
105101

106102
repositories {
107-
maven {
108-
url = uri("https://api.bintray.com/maven/${Publish.user}/$BINTRAY_REPO/libui/;publish=0;override=1")
103+
maven("https://api.bintray.com/maven/${Publish.user}/$BINTRAY_REPO/libui/;publish=0;override=1") {
109104
credentials {
110105
username = Publish.user
111106
password = System.getenv("BINTRAY_API_KEY")
@@ -114,7 +109,7 @@ publishing {
114109
}
115110
}
116111

117-
tasks.withType<AbstractPublishToMaven>().all {
112+
tasks.withType<AbstractPublishToMaven> {
118113
onlyIf { !name.startsWith("publishWindows") || os.isWindows }
119114
onlyIf { !name.startsWith("publishMacosx") || os.isMacOsX }
120115
onlyIf { !name.startsWith("publishLinux") || os.isLinux }

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ pluginManagement {
1111
}
1212

1313
repositories {
14-
if (Kotlin.repo.isNotEmpty()) maven { url = uri(Kotlin.repo) }
1514
mavenCentral()
1615
maven { url = uri("https://plugins.gradle.org/m2/") }
16+
maven { url = uri("https://dl.bintray.com/kotlin/kotlin-dev") }
1717
}
1818
}
1919

0 commit comments

Comments
 (0)