From e2aed98ebdef54d686ef79ab7b8ca504c848440c Mon Sep 17 00:00:00 2001 From: Anthony Cicchetti Date: Mon, 3 Sep 2018 13:12:01 -0400 Subject: [PATCH] Added kotlin DSL buildscripts for common and buildSrc --- .idea/kotlinScripting.xml | 6 +++ buildSrc/build.gradle | 36 ---------------- buildSrc/build.gradle.kts | 18 ++++++++ .../financetracker}/DependencyVersions.kt | 2 +- common/build.gradle | 43 ------------------- common/build.gradle.kts | 33 ++++++++++++++ gradle/wrapper/gradle-wrapper.properties | 2 +- 7 files changed, 59 insertions(+), 81 deletions(-) create mode 100644 .idea/kotlinScripting.xml delete mode 100644 buildSrc/build.gradle create mode 100644 buildSrc/build.gradle.kts rename buildSrc/src/main/kotlin/{ => com/anthonycicchetti/financetracker}/DependencyVersions.kt (90%) delete mode 100644 common/build.gradle create mode 100644 common/build.gradle.kts diff --git a/.idea/kotlinScripting.xml b/.idea/kotlinScripting.xml new file mode 100644 index 0000000..ecd0e4f --- /dev/null +++ b/.idea/kotlinScripting.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle deleted file mode 100644 index c4453c6..0000000 --- a/buildSrc/build.gradle +++ /dev/null @@ -1,36 +0,0 @@ -buildscript { - ext.kotlin_version = '1.2.60' - ext.android_gradle_plugin_version = '3.1.3' - repositories { - jcenter() - google() - } - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - -repositories { - jcenter() - google() -} - -apply plugin: 'java' -apply plugin: 'kotlin' - -dependencies { - implementation "com.android.tools.build:gradle:$android_gradle_plugin_version" - implementation "com.android.tools.build:gradle-api:$android_gradle_plugin_version" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" -} - -compileKotlin { - kotlinOptions { - jvmTarget = "1.8" - } -} -compileTestKotlin { - kotlinOptions { - jvmTarget = "1.8" - } -} \ No newline at end of file diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts new file mode 100644 index 0000000..cff0ce7 --- /dev/null +++ b/buildSrc/build.gradle.kts @@ -0,0 +1,18 @@ +plugins { + java + kotlin("jvm") version "1.2.61" +} + +repositories { + jcenter() + google() +} + +val android_gradle_plugin_version = "3.1.3" +val kotlin_version = "1.2.61" + +dependencies { + implementation("com.android.tools.build:gradle:$android_gradle_plugin_version") + implementation("com.android.tools.build:gradle-api:$android_gradle_plugin_version") + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version") +} \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/DependencyVersions.kt b/buildSrc/src/main/kotlin/com/anthonycicchetti/financetracker/DependencyVersions.kt similarity index 90% rename from buildSrc/src/main/kotlin/DependencyVersions.kt rename to buildSrc/src/main/kotlin/com/anthonycicchetti/financetracker/DependencyVersions.kt index 74e5756..0df0a08 100644 --- a/buildSrc/src/main/kotlin/DependencyVersions.kt +++ b/buildSrc/src/main/kotlin/com/anthonycicchetti/financetracker/DependencyVersions.kt @@ -1,7 +1,7 @@ package com.anthonycicchetti.financetracker object DependencyVersions { - const val Kotlin = "1.2.60" + const val Kotlin = "1.2.61" const val Jupiter = "5.2.0" const val Jackson = "2.9.6" diff --git a/common/build.gradle b/common/build.gradle deleted file mode 100644 index f81f45e..0000000 --- a/common/build.gradle +++ /dev/null @@ -1,43 +0,0 @@ -import com.anthonycicchetti.financetracker.DependencyVersions - -buildscript { - repositories { - mavenCentral() - } - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${DependencyVersions.Kotlin}" - } -} - -plugins { - id 'java-library' - id 'kotlin' -} - -group 'online.anthonycicchetti' -version '0.1.0' - - -repositories { - mavenCentral() - google() - jcenter() -} - -dependencies { - api "com.fasterxml.jackson.module:jackson-module-kotlin:${DependencyVersions.Jackson}" - - testImplementation "org.junit.jupiter:junit-jupiter-api:${DependencyVersions.Jupiter}" - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${DependencyVersions.Jupiter}" -} - -compileKotlin { - kotlinOptions.jvmTarget = "1.8" -} -compileTestKotlin { - kotlinOptions.jvmTarget = "1.8" -} - -test { - useJUnitPlatform() -} \ No newline at end of file diff --git a/common/build.gradle.kts b/common/build.gradle.kts new file mode 100644 index 0000000..f5c90be --- /dev/null +++ b/common/build.gradle.kts @@ -0,0 +1,33 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile +import com.anthonycicchetti.financetracker.DependencyVersions + +plugins { + `java-library` + kotlin("jvm") +} + +group = "com.anthonycicchetti.financetracker" +version = "0.1.0" + +repositories { + mavenCentral() + google() + jcenter() +} + +dependencies { + api("com.fasterxml.jackson.module:jackson-module-kotlin:${DependencyVersions.Jackson}") + + testImplementation("org.junit.jupiter:junit-jupiter-api:${DependencyVersions.Jupiter}") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${DependencyVersions.Jupiter}") +} + +tasks.withType { + kotlinOptions { + jvmTarget = "1.8" + } +} + +tasks.named("test"){ + useJUnitPlatform() +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a95009c..115e6ac 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists