Skip to content

Commit

Permalink
update to kotlin 1.3.60 (#29)
Browse files Browse the repository at this point in the history
* update to kotlin 1.3.61
* remove dependencies.gradle
  • Loading branch information
patjackson52 committed Nov 30, 2019
1 parent 3548063 commit b581208
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 33 deletions.
10 changes: 3 additions & 7 deletions build.gradle
@@ -1,6 +1,4 @@
buildscript {
apply from: "$rootDir/gradle/dependencies.gradle"

repositories {
google()
maven { url 'https://dl.bintray.com/jetbrains/kotlin-native-dependencies' }
Expand All @@ -10,18 +8,16 @@ buildscript {
}

dependencies {
classpath deps.plugins.kotlin
classpath deps.plugins.dokka
classpath deps.plugins.android
classpath Plugins.kotlin
classpath Plugins.dokka
classpath Plugins.android
}
}

plugins {
id("de.fayard.buildSrcVersions") version "0.4.2"
}

apply from: "$rootDir/gradle/dependencies.gradle"

allprojects {
repositories {
google()
Expand Down
5 changes: 5 additions & 0 deletions buildSrc/src/main/kotlin/Plugins.kt
@@ -0,0 +1,5 @@
object Plugins {
const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.org_jetbrains_kotlin}"
const val dokka = "org.jetbrains.dokka:dokka-gradle-plugin:${Versions.dokka_gradle_plugin}"
const val android = "com.android.tools.build:gradle:${Versions.com_android_tools_build_gradle}"
}
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/Versions.kt
Expand Up @@ -34,7 +34,7 @@ object Versions {

const val dokka_gradle_plugin: String = "0.9.17" // available: "0.9.18"

const val org_jetbrains_kotlin: String = "1.3.50"
const val org_jetbrains_kotlin: String = "1.3.61"

const val spek: String = "2.1.0-alpha.0.11+d97ef33"
// available: "2.1.0-alpha.0.24+0fdeb6e"
Expand Down
14 changes: 0 additions & 14 deletions gradle/dependencies.gradle

This file was deleted.

2 changes: 1 addition & 1 deletion gradle/publish.gradle
Expand Up @@ -75,7 +75,7 @@ task javadocsJar(type: Jar, dependsOn: dokka) {
}

signing {
required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }
required { isReleaseBuild() /*&& gradle.taskGraph.hasTask("uploadArchives") */ }
sign(publishing.publications)
}

Expand Down
19 changes: 9 additions & 10 deletions lib/build.gradle
Expand Up @@ -7,7 +7,7 @@ apply plugin: 'kotlin-multiplatform'
archivesBaseName = 'redux-kotlin'

group 'org.reduxkotlin'
version '0.2.7'
version '0.2.9'

kotlin {
jvm()
Expand All @@ -21,7 +21,6 @@ kotlin {
}
}


iosArm64("ios")
iosX64("iosSim")
macosX64("macos")
Expand All @@ -44,9 +43,9 @@ kotlin {
dependencies {
implementation kotlin("test-common")
implementation kotlin("test-annotations-common")
implementation "org.spekframework.spek2:spek-dsl-metadata:$project.versions.spek"
implementation "ch.tutteli.atrium:atrium-cc-en_GB-robstoll-common:$project.versions.atrium"
implementation "io.mockk:mockk-common:1.9.3"
implementation Libs.spek_dsl_metadata
implementation Libs.atrium_cc_en_gb_robstoll_common
implementation Libs.mockk_common
}
}

Expand All @@ -60,12 +59,12 @@ kotlin {
dependencies {
implementation kotlin("test")
implementation kotlin("test-junit")
implementation "org.spekframework.spek2:spek-dsl-jvm:$project.versions.spek"
implementation "ch.tutteli.atrium:atrium-cc-en_GB-robstoll:$project.versions.atrium"
implementation "io.mockk:mockk:1.9.3"
implementation Libs.spek_dsl_jvm
implementation Libs.atrium_cc_en_gb_robstoll
implementation Libs.mockk

runtimeOnly "org.spekframework.spek2:spek-runner-junit5:$project.versions.spek"
runtimeOnly 'org.jetbrains.kotlin:kotlin-reflect'
runtimeOnly Libs.spek_runner_junit5
runtimeOnly Libs.kotlin_reflect
}
}
jsMain {
Expand Down

0 comments on commit b581208

Please sign in to comment.