Skip to content

Commit

Permalink
Kotlin 1.3.50 release (#54)
Browse files Browse the repository at this point in the history
Also updated gradle and ktlint
  • Loading branch information
benasher44 authored Aug 22, 2019
1 parent f768b0e commit 788cbe9
Show file tree
Hide file tree
Showing 9 changed files with 52 additions and 20 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/), and this
project adheres to [Semantic Versioning](https://semver.org/).

## [Unreleased]
## [0.0.4] - 2019-08-22
### Added
- `uuid4` function (#42)
### Changed
- Kotlin version to 1.3.50 (#54)
### Deprecated
- no-args constructor in favor of `uuid4` (#42)

Expand Down
18 changes: 8 additions & 10 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinNativeLink
import org.jetbrains.kotlin.konan.target.HostManager

plugins {
kotlin("multiplatform") version "1.3.40"
kotlin("multiplatform") version "1.3.50"
id("org.jetbrains.dokka") version "0.9.18"
id("maven-publish")
id("signing")
Expand Down Expand Up @@ -129,7 +129,7 @@ kotlin {
val ktlintConfig by configurations.creating

dependencies {
ktlintConfig("com.pinterest:ktlint:0.32.0")
ktlintConfig("com.pinterest:ktlint:0.34.2")
}

val ktlint by tasks.registering(JavaExec::class) {
Expand All @@ -148,10 +148,9 @@ val ktlintformat by tasks.registering(JavaExec::class) {
args = listOf("-F", "src/**/*.kt")
}

tasks.getByName("check") {
configure {
dependsOn(ktlint)
}
val checkTask = tasks.named("check")
checkTask.configure {
dependsOn(ktlint)
}

if (HostManager.hostIsMac) {
Expand All @@ -163,15 +162,14 @@ if (HostManager.hostIsMac) {
setArgs(listOf(
"simctl",
"spawn",
"-s",
"iPad Air 2",
linkDebugTestIosSim.outputFile.get()
))
}

tasks.getByName("check") {
configure {
dependsOn(testIosSim)
}
checkTask.configure {
dependsOn(testIosSim)
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kotlin.code.style=official
kotlin.incremental=true

GROUP=com.benasher44
VERSION=0.0.4-SNAPSHOT
VERSION=0.0.4

POM_URL=https://github.com/benasher44/uuid/
POM_SCM_URL=https://github.com/benasher44/uuid/
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
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.4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
18 changes: 17 additions & 1 deletion gradlew
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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=""
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
Expand Down
18 changes: 17 additions & 1 deletion gradlew.bat
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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=
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
Expand Down
8 changes: 4 additions & 4 deletions src/cocoaTest/kotlin/CocoaUuidTest.kt
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package com.benasher44.uuid

import kotlinx.cinterop.addressOf
import kotlinx.cinterop.reinterpret
import kotlinx.cinterop.usePinned
import platform.Foundation.NSUUID
import kotlin.native.concurrent.isFrozen
import kotlin.test.Test
import kotlin.test.assertEquals
import kotlin.test.assertTrue
import kotlinx.cinterop.addressOf
import kotlinx.cinterop.reinterpret
import kotlinx.cinterop.usePinned
import platform.Foundation.NSUUID

class CocoaUuidTest {
@Test
Expand Down
2 changes: 1 addition & 1 deletion src/jvmTest/kotlin/com/benasher44/uuid/JvmUuidTest.kt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.benasher44.uuid

import org.junit.Test
import kotlin.test.assertEquals
import org.junit.Test

class JvmUuidTest {

Expand Down

0 comments on commit 788cbe9

Please sign in to comment.