Skip to content
This repository has been archived by the owner on Oct 19, 2021. It is now read-only.

Commit

Permalink
Merge pull request #16 from touchlab/kpg/kotlin_140
Browse files Browse the repository at this point in the history
Version 0.12
  • Loading branch information
kpgalligan authored Sep 18, 2020
2 parents cec09ab + bded8aa commit 702a649
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {
}

dependencies {
classpath deps.plugins.kotlin
classpath deps.plugins.kotlinBuild
}
}

Expand Down
4 changes: 2 additions & 2 deletions gradle-plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ dependencies {
implementation deps.kotlin.native_utils

compileOnly gradleApi()
compileOnly deps.plugins.kotlin
compileOnly deps.plugins.kotlinDependency

testImplementation deps.junit
testImplementation deps.truth

fixtureClasspath deps.plugins.kotlin
fixtureClasspath deps.plugins.kotlinDependency
}

apply from: "$rootDir/gradle/gradle-mvn-push.gradle"
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
GROUP=co.touchlab
VERSION_NAME=0.11
VERSION_NAME=0.12

POM_URL=https://github.com/touchlab/KotlinCocoapods/
POM_SCM_URL=https://github.com/touchlab/KotlinCocoapods/
Expand Down
14 changes: 8 additions & 6 deletions gradle/dependencies.gradle
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
ext.versions = [
kotlin: '1.4.0',
kotlinBuild: '1.3.72',
kotlinDependency: '1.4.0',
]

ext.deps = [
plugins: [
kotlin: "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}",
kotlinBuild: "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlinBuild}",
kotlinDependency: "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlinDependency}",
],

kotlin: [
stdlib: [
jdk: "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}",
jdk: "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlinDependency}",
],
native_utils: "org.jetbrains.kotlin:kotlin-native-utils:${versions.kotlin}",
native_utils: "org.jetbrains.kotlin:kotlin-native-utils:${versions.kotlinDependency}",
test: [
common: "org.jetbrains.kotlin:kotlin-test-common:${versions.kotlin}",
commonAnnotations: "org.jetbrains.kotlin:kotlin-test-annotations-common:${versions.kotlin}",
common: "org.jetbrains.kotlin:kotlin-test-common:${versions.kotlinDependency}",
commonAnnotations: "org.jetbrains.kotlin:kotlin-test-annotations-common:${versions.kotlinDependency}",
],
],
junit: 'junit:junit:4.12',
Expand Down

0 comments on commit 702a649

Please sign in to comment.