Skip to content

Commit

Permalink
Kotlin 1.3.60
Browse files Browse the repository at this point in the history
  • Loading branch information
msink committed Nov 18, 2019
1 parent e20680b commit ab3dc6c
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 21 deletions.
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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") }
}
}

Expand Down
5 changes: 2 additions & 3 deletions buildSrc/src/main/kotlin/Versions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -25,5 +24,5 @@ object Dokka {
}

object Download {
const val version = "3.4.3"
const val version = "4.0.1"
}
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.6.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
19 changes: 7 additions & 12 deletions libui/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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")
Expand All @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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") }
}
}

Expand Down

0 comments on commit ab3dc6c

Please sign in to comment.