From bded8aade265fa5100e38928f5196f7e7212ef71 Mon Sep 17 00:00:00 2001 From: Kevin Galligan Date: Thu, 17 Sep 2020 20:02:51 -0400 Subject: [PATCH] Version 0.12 --- build.gradle | 2 +- gradle-plugin/build.gradle | 4 ++-- gradle.properties | 2 +- gradle/dependencies.gradle | 14 ++++++++------ 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 99c31a0..745e62f 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath deps.plugins.kotlin + classpath deps.plugins.kotlinBuild } } diff --git a/gradle-plugin/build.gradle b/gradle-plugin/build.gradle index a5d159a..a74a1fc 100644 --- a/gradle-plugin/build.gradle +++ b/gradle-plugin/build.gradle @@ -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" diff --git a/gradle.properties b/gradle.properties index b945394..12ff8f5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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/ diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 3fd5fe5..9a67575 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -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',