diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle index 0dce1557737..aef13670424 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle @@ -3,6 +3,7 @@ plugins { id 'org.jetbrains.kotlin.android' id 'kotlin-android-extensions' } + group = 'testGroupId' version = '1.0-SNAPSHOT' @@ -15,11 +16,13 @@ repositories { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } + dependencies { implementation 'com.google.android.material:material:1.2.0' implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' } + android { compileSdkVersion 29 defaultConfig { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle.kts index ec88d348d8a..0ddc9daab27 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle.kts @@ -3,6 +3,7 @@ plugins { kotlin("android") id("kotlin-android-extensions") } + group = "testGroupId" version = "1.0-SNAPSHOT" @@ -15,11 +16,13 @@ repositories { url = uri("https://dl.bintray.com/kotlin/kotlin-dev") } } + dependencies { implementation("com.google.android.material:material:1.2.0") implementation("androidx.appcompat:appcompat:1.2.0") implementation("androidx.constraintlayout:constraintlayout:1.1.3") } + android { compileSdkVersion(29) defaultConfig { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/build.gradle index d983465a29a..f6061da5f84 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/build.gradle @@ -12,6 +12,7 @@ buildscript { classpath('com.android.tools.build:gradle:4.0.1') } } + group = 'testGroupId' version = '1.0-SNAPSHOT' diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/build.gradle.kts index c04f7a3185e..ea68b003be0 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/build.gradle.kts @@ -12,6 +12,7 @@ buildscript { classpath("com.android.tools.build:gradle:4.0.1") } } + group = "testGroupId" version = "1.0-SNAPSHOT" diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jsNodeAndBrowserTargets/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jsNodeAndBrowserTargets/build.gradle index 44b026328ad..afa95e5808c 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jsNodeAndBrowserTargets/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jsNodeAndBrowserTargets/build.gradle @@ -1,6 +1,7 @@ plugins { id 'org.jetbrains.kotlin.multiplatform' version 'KOTLIN_VERSION' } + group = 'testGroupId' version = '1.0-SNAPSHOT' @@ -10,6 +11,7 @@ repositories { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } + kotlin { js('nodeJs', LEGACY) { nodejs { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jsNodeAndBrowserTargets/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jsNodeAndBrowserTargets/build.gradle.kts index 99568a430d6..03f2f8be44a 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jsNodeAndBrowserTargets/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jsNodeAndBrowserTargets/build.gradle.kts @@ -1,6 +1,7 @@ plugins { kotlin("multiplatform") version "KOTLIN_VERSION" } + group = "testGroupId" version = "1.0-SNAPSHOT" @@ -10,6 +11,7 @@ repositories { url = uri("https://dl.bintray.com/kotlin/kotlin-dev") } } + kotlin { js("nodeJs", LEGACY) { nodejs { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTarget/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTarget/build.gradle index 0834910b49e..b9e7f033506 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTarget/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTarget/build.gradle @@ -1,6 +1,7 @@ plugins { id 'org.jetbrains.kotlin.multiplatform' version 'KOTLIN_VERSION' } + group = 'testGroupId' version = '1.0-SNAPSHOT' @@ -10,6 +11,7 @@ repositories { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } + kotlin { jvm { compilations.all { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTarget/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTarget/build.gradle.kts index f63691b3357..33a5b934cac 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTarget/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTarget/build.gradle.kts @@ -1,6 +1,7 @@ plugins { kotlin("multiplatform") version "KOTLIN_VERSION" } + group = "testGroupId" version = "1.0-SNAPSHOT" @@ -10,6 +11,7 @@ repositories { url = uri("https://dl.bintray.com/kotlin/kotlin-dev") } } + kotlin { jvm { compilations.all { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTargetWithJava/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTargetWithJava/build.gradle index 58bbf6681a2..b47ab40b5c1 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTargetWithJava/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTargetWithJava/build.gradle @@ -1,6 +1,7 @@ plugins { id 'org.jetbrains.kotlin.multiplatform' version 'KOTLIN_VERSION' } + group = 'testGroupId' version = '1.0-SNAPSHOT' @@ -10,6 +11,7 @@ repositories { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } + kotlin { jvm { compilations.all { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTargetWithJava/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTargetWithJava/build.gradle.kts index b07bbbb46e5..d241cb820b1 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTargetWithJava/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTargetWithJava/build.gradle.kts @@ -1,6 +1,7 @@ plugins { kotlin("multiplatform") version "KOTLIN_VERSION" } + group = "testGroupId" version = "1.0-SNAPSHOT" @@ -10,6 +11,7 @@ repositories { url = uri("https://dl.bintray.com/kotlin/kotlin-dev") } } + kotlin { jvm { compilations.all { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/a/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/a/build.gradle index a7c8f1980a2..23374d5607e 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/a/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/a/build.gradle @@ -1,6 +1,7 @@ plugins { id 'org.jetbrains.kotlin.jvm' version 'KOTLIN_VERSION' } + group = 'testGroupId' version = '1.0-SNAPSHOT' @@ -10,14 +11,17 @@ repositories { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } + dependencies { implementation project(':b') implementation project(':c') testImplementation 'org.jetbrains.kotlin:kotlin-test-junit' } + test { useJUnit() } + compileKotlin { kotlinOptions.jvmTarget = '1.8' } \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/a/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/a/build.gradle.kts index f1542fd52c7..6c172e5c17e 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/a/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/a/build.gradle.kts @@ -3,6 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { kotlin("jvm") version "KOTLIN_VERSION" } + group = "testGroupId" version = "1.0-SNAPSHOT" @@ -12,14 +13,17 @@ repositories { url = uri("https://dl.bintray.com/kotlin/kotlin-dev") } } + dependencies { implementation(project(":b")) implementation(project(":c")) testImplementation(kotlin("test-junit")) } + tasks.test { useJUnit() } + tasks.withType() { kotlinOptions.jvmTarget = "1.8" } \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/b/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/b/build.gradle index 09d451668fd..98b4777c197 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/b/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/b/build.gradle @@ -1,6 +1,7 @@ plugins { id 'org.jetbrains.kotlin.jvm' version 'KOTLIN_VERSION' } + group = 'testGroupId' version = '1.0-SNAPSHOT' @@ -10,14 +11,17 @@ repositories { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } + dependencies { implementation project(':c') implementation project(':d') testImplementation 'org.jetbrains.kotlin:kotlin-test-junit' } + test { useJUnit() } + compileKotlin { kotlinOptions.jvmTarget = '1.8' } \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/b/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/b/build.gradle.kts index b590b3fda51..e6169b522cc 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/b/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/b/build.gradle.kts @@ -3,6 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { kotlin("jvm") version "KOTLIN_VERSION" } + group = "testGroupId" version = "1.0-SNAPSHOT" @@ -12,14 +13,17 @@ repositories { url = uri("https://dl.bintray.com/kotlin/kotlin-dev") } } + dependencies { implementation(project(":c")) implementation(project(":d")) testImplementation(kotlin("test-junit")) } + tasks.test { useJUnit() } + tasks.withType() { kotlinOptions.jvmTarget = "1.8" } \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/c/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/c/build.gradle index 2ea3a0d2788..4c887b95fe0 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/c/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/c/build.gradle @@ -1,6 +1,7 @@ plugins { id 'org.jetbrains.kotlin.jvm' version 'KOTLIN_VERSION' } + group = 'testGroupId' version = '1.0-SNAPSHOT' @@ -10,12 +11,15 @@ repositories { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } + dependencies { testImplementation 'org.jetbrains.kotlin:kotlin-test-junit' } + test { useJUnit() } + compileKotlin { kotlinOptions.jvmTarget = '1.8' } \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/c/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/c/build.gradle.kts index bde194fae7f..3e019e92426 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/c/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/c/build.gradle.kts @@ -3,6 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { kotlin("jvm") version "KOTLIN_VERSION" } + group = "testGroupId" version = "1.0-SNAPSHOT" @@ -12,12 +13,15 @@ repositories { url = uri("https://dl.bintray.com/kotlin/kotlin-dev") } } + dependencies { testImplementation(kotlin("test-junit")) } + tasks.test { useJUnit() } + tasks.withType() { kotlinOptions.jvmTarget = "1.8" } \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/d/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/d/build.gradle index c88555163af..6eeb86f778f 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/d/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/d/build.gradle @@ -1,6 +1,7 @@ plugins { id 'org.jetbrains.kotlin.jvm' version 'KOTLIN_VERSION' } + group = 'testGroupId' version = '1.0-SNAPSHOT' @@ -10,13 +11,16 @@ repositories { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } + dependencies { implementation project(':a') testImplementation 'org.jetbrains.kotlin:kotlin-test-junit' } + test { useJUnit() } + compileKotlin { kotlinOptions.jvmTarget = '1.8' } \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/d/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/d/build.gradle.kts index 40fda1eb0e9..dcac901e86c 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/d/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/d/build.gradle.kts @@ -3,6 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { kotlin("jvm") version "KOTLIN_VERSION" } + group = "testGroupId" version = "1.0-SNAPSHOT" @@ -12,13 +13,16 @@ repositories { url = uri("https://dl.bintray.com/kotlin/kotlin-dev") } } + dependencies { implementation(project(":a")) testImplementation(kotlin("test-junit")) } + tasks.test { useJUnit() } + tasks.withType() { kotlinOptions.jvmTarget = "1.8" } \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/build.gradle index 10bda66f74d..08275ed2f16 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/build.gradle @@ -1,6 +1,7 @@ plugins { id 'org.jetbrains.kotlin.jvm' } + group = 'testGroupId' version = '1.0-SNAPSHOT' @@ -10,13 +11,16 @@ repositories { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } + dependencies { rootProject testImplementation 'org.jetbrains.kotlin:kotlin-test-junit' } + test { useJUnit() } + compileKotlin { kotlinOptions.jvmTarget = '1.8' } \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/build.gradle.kts index 2cd64ee07be..b4a099c4ea8 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/build.gradle.kts @@ -3,6 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { kotlin("jvm") } + group = "testGroupId" version = "1.0-SNAPSHOT" @@ -12,13 +13,16 @@ repositories { url = uri("https://dl.bintray.com/kotlin/kotlin-dev") } } + dependencies { rootProject testImplementation(kotlin("test-junit")) } + tasks.test { useJUnit() } + tasks.withType() { kotlinOptions.jvmTarget = "1.8" } \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/c/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/c/build.gradle index 7e6cbde2755..0bab63ef74b 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/c/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/c/build.gradle @@ -1,6 +1,7 @@ plugins { id 'org.jetbrains.kotlin.jvm' } + group = 'testGroupId' version = '1.0-SNAPSHOT' @@ -10,13 +11,16 @@ repositories { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } + dependencies { implementation project(':b') testImplementation 'org.jetbrains.kotlin:kotlin-test-junit' } + test { useJUnit() } + compileKotlin { kotlinOptions.jvmTarget = '1.8' } \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/c/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/c/build.gradle.kts index bb4248a78e0..07a2ea3cdef 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/c/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/c/build.gradle.kts @@ -3,6 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { kotlin("jvm") } + group = "testGroupId" version = "1.0-SNAPSHOT" @@ -12,13 +13,16 @@ repositories { url = uri("https://dl.bintray.com/kotlin/kotlin-dev") } } + dependencies { implementation(project(":b")) testImplementation(kotlin("test-junit")) } + tasks.test { useJUnit() } + tasks.withType() { kotlinOptions.jvmTarget = "1.8" } \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/build.gradle index 2ea3a0d2788..4c887b95fe0 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/build.gradle @@ -1,6 +1,7 @@ plugins { id 'org.jetbrains.kotlin.jvm' version 'KOTLIN_VERSION' } + group = 'testGroupId' version = '1.0-SNAPSHOT' @@ -10,12 +11,15 @@ repositories { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } + dependencies { testImplementation 'org.jetbrains.kotlin:kotlin-test-junit' } + test { useJUnit() } + compileKotlin { kotlinOptions.jvmTarget = '1.8' } \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/build.gradle.kts index bde194fae7f..3e019e92426 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/build.gradle.kts @@ -3,6 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { kotlin("jvm") version "KOTLIN_VERSION" } + group = "testGroupId" version = "1.0-SNAPSHOT" @@ -12,12 +13,15 @@ repositories { url = uri("https://dl.bintray.com/kotlin/kotlin-dev") } } + dependencies { testImplementation(kotlin("test-junit")) } + tasks.test { useJUnit() } + tasks.withType() { kotlinOptions.jvmTarget = "1.8" } \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/build.gradle index f9e6b158a2c..74bb2134e05 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/build.gradle @@ -1,6 +1,7 @@ plugins { id 'org.jetbrains.kotlin.jvm' version 'KOTLIN_VERSION' } + group = 'testGroupId' version = '1.0-SNAPSHOT' @@ -10,12 +11,15 @@ repositories { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } + dependencies { testImplementation 'org.jetbrains.kotlin:kotlin-test-junit' } + test { useJUnit() } + compileKotlin { kotlinOptions.jvmTarget = '1.6' } \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/build.gradle.kts index 24d4743233c..c6ac6ff2e0b 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/build.gradle.kts @@ -3,6 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { kotlin("jvm") version "KOTLIN_VERSION" } + group = "testGroupId" version = "1.0-SNAPSHOT" @@ -12,12 +13,15 @@ repositories { url = uri("https://dl.bintray.com/kotlin/kotlin-dev") } } + dependencies { testImplementation(kotlin("test-junit")) } + tasks.test { useJUnit() } + tasks.withType() { kotlinOptions.jvmTarget = "1.6" } \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/nativeForCurrentSystem/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/nativeForCurrentSystem/build.gradle index b277cacd8d8..4602b2f7f0b 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/nativeForCurrentSystem/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/nativeForCurrentSystem/build.gradle @@ -3,6 +3,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithTests plugins { id 'org.jetbrains.kotlin.multiplatform' version 'KOTLIN_VERSION' } + group = 'testGroupId' version = '1.0-SNAPSHOT' @@ -12,6 +13,7 @@ repositories { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } + kotlin { def hostOs = System.getProperty("os.name") def isMingwX64 = hostOs.startsWith("Windows") diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/nativeForCurrentSystem/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/nativeForCurrentSystem/build.gradle.kts index da17c3c120b..578ec738a6e 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/nativeForCurrentSystem/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/nativeForCurrentSystem/build.gradle.kts @@ -1,6 +1,7 @@ plugins { kotlin("multiplatform") version "KOTLIN_VERSION" } + group = "testGroupId" version = "1.0-SNAPSHOT" @@ -10,6 +11,7 @@ repositories { url = uri("https://dl.bintray.com/kotlin/kotlin-dev") } } + kotlin { val hostOs = System.getProperty("os.name") val isMingwX64 = hostOs.startsWith("Windows") diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleMultiplatform/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleMultiplatform/build.gradle index 98b64a5020a..dde7a4dcd9b 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleMultiplatform/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleMultiplatform/build.gradle @@ -1,6 +1,7 @@ plugins { id 'org.jetbrains.kotlin.multiplatform' version 'KOTLIN_VERSION' } + group = 'testGroupId' version = '1.0-SNAPSHOT' @@ -10,6 +11,7 @@ repositories { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } + kotlin { jvm { compilations.all { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleMultiplatform/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleMultiplatform/build.gradle.kts index 08a1aff1b45..d7690873e84 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleMultiplatform/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleMultiplatform/build.gradle.kts @@ -1,6 +1,7 @@ plugins { kotlin("multiplatform") version "KOTLIN_VERSION" } + group = "testGroupId" version = "1.0-SNAPSHOT" @@ -10,6 +11,7 @@ repositories { url = uri("https://dl.bintray.com/kotlin/kotlin-dev") } } + kotlin { jvm { compilations.all { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleNativeTarget/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleNativeTarget/build.gradle index 25e19fd96ca..d88d079f874 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleNativeTarget/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleNativeTarget/build.gradle @@ -1,6 +1,7 @@ plugins { id 'org.jetbrains.kotlin.multiplatform' version 'KOTLIN_VERSION' } + group = 'testGroupId' version = '1.0-SNAPSHOT' @@ -10,6 +11,7 @@ repositories { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } + kotlin { linuxX64() sourceSets { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleNativeTarget/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleNativeTarget/build.gradle.kts index 29c48fda8d6..a0ba678b93f 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleNativeTarget/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleNativeTarget/build.gradle.kts @@ -1,6 +1,7 @@ plugins { kotlin("multiplatform") version "KOTLIN_VERSION" } + group = "testGroupId" version = "1.0-SNAPSHOT" @@ -10,6 +11,7 @@ repositories { url = uri("https://dl.bintray.com/kotlin/kotlin-dev") } } + kotlin { linuxX64() sourceSets { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsBrowser/expected/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsBrowser/expected/build.gradle index 3f65b01d368..2d8d2188e56 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsBrowser/expected/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsBrowser/expected/build.gradle @@ -1,6 +1,7 @@ plugins { id 'org.jetbrains.kotlin.js' version 'KOTLIN_VERSION' } + group = 'testGroupId' version = '1.0-SNAPSHOT' @@ -10,9 +11,11 @@ repositories { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } + dependencies { testImplementation 'org.jetbrains.kotlin:kotlin-test-js' } + kotlin { js(LEGACY) { browser { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsBrowser/expected/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsBrowser/expected/build.gradle.kts index 14e97f5d338..4c7abd660ee 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsBrowser/expected/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsBrowser/expected/build.gradle.kts @@ -1,6 +1,7 @@ plugins { kotlin("js") version "KOTLIN_VERSION" } + group = "testGroupId" version = "1.0-SNAPSHOT" @@ -10,9 +11,11 @@ repositories { url = uri("https://dl.bintray.com/kotlin/kotlin-dev") } } + dependencies { testImplementation(kotlin("test-js")) } + kotlin { js(LEGACY) { browser { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/expected/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/expected/build.gradle index 3df6221bbc5..0c8cae37573 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/expected/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/expected/build.gradle @@ -1,6 +1,7 @@ plugins { id 'org.jetbrains.kotlin.js' version 'KOTLIN_VERSION' } + group = 'testGroupId' version = '1.0-SNAPSHOT' @@ -10,9 +11,11 @@ repositories { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } + dependencies { testImplementation 'org.jetbrains.kotlin:kotlin-test-js' } + kotlin { js(LEGACY) { nodejs { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/expected/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/expected/build.gradle.kts index 073b1ec3615..5d9687d825c 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/expected/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/expected/build.gradle.kts @@ -1,6 +1,7 @@ plugins { kotlin("js") version "KOTLIN_VERSION" } + group = "testGroupId" version = "1.0-SNAPSHOT" @@ -10,9 +11,11 @@ repositories { url = uri("https://dl.bintray.com/kotlin/kotlin-dev") } } + dependencies { testImplementation(kotlin("test-js")) } + kotlin { js(LEGACY) { nodejs { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/build.gradle index b8b04864aea..57cff633106 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/build.gradle @@ -1,6 +1,7 @@ plugins { id 'org.jetbrains.kotlin.jvm' version 'KOTLIN_VERSION' } + group = 'me.user' version = '1.0-SNAPSHOT' @@ -10,12 +11,15 @@ repositories { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } + dependencies { testImplementation 'org.jetbrains.kotlin:kotlin-test-junit' } + test { useJUnit() } + compileKotlin { kotlinOptions.jvmTarget = '1.8' } \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/build.gradle.kts index 270f6162c1c..8896fab00cb 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/build.gradle.kts @@ -3,6 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { kotlin("jvm") version "KOTLIN_VERSION" } + group = "me.user" version = "1.0-SNAPSHOT" @@ -12,12 +13,15 @@ repositories { url = uri("https://dl.bintray.com/kotlin/kotlin-dev") } } + dependencies { testImplementation(kotlin("test-junit")) } + tasks.test { useJUnit() } + tasks.withType() { kotlinOptions.jvmTarget = "1.8" } \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/build.gradle index cb20875bb7c..267aafd4c2d 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/build.gradle @@ -2,6 +2,7 @@ plugins { id 'org.jetbrains.kotlin.jvm' version 'KOTLIN_VERSION' id 'application' } + group = 'me.user' version = '1.0-SNAPSHOT' @@ -11,15 +12,19 @@ repositories { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } + dependencies { testImplementation 'org.jetbrains.kotlin:kotlin-test-junit' } + test { useJUnit() } + compileKotlin { kotlinOptions.jvmTarget = '1.8' } + application { mainClassName = 'MainKt' } \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/build.gradle.kts index 42090664ee0..51360611b4c 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/build.gradle.kts @@ -4,6 +4,7 @@ plugins { kotlin("jvm") version "KOTLIN_VERSION" application } + group = "me.user" version = "1.0-SNAPSHOT" @@ -13,15 +14,19 @@ repositories { url = uri("https://dl.bintray.com/kotlin/kotlin-dev") } } + dependencies { testImplementation(kotlin("test-junit")) } + tasks.test { useJUnit() } + tasks.withType() { kotlinOptions.jvmTarget = "1.8" } + application { mainClassName = "MainKt" } \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle index bc32b30c665..3c950eb1956 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle @@ -1,6 +1,7 @@ plugins { id 'org.jetbrains.kotlin.js' version 'KOTLIN_VERSION' } + group = 'me.user' version = '1.0-SNAPSHOT' @@ -11,9 +12,11 @@ repositories { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } + dependencies { testImplementation 'org.jetbrains.kotlin:kotlin-test-js' } + kotlin { js(LEGACY) { browser { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle.kts index 5e88e955317..06bdc481fad 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle.kts @@ -1,6 +1,7 @@ plugins { kotlin("js") version "KOTLIN_VERSION" } + group = "me.user" version = "1.0-SNAPSHOT" @@ -11,9 +12,11 @@ repositories { url = uri("https://dl.bintray.com/kotlin/kotlin-dev") } } + dependencies { testImplementation(kotlin("test-js")) } + kotlin { js(LEGACY) { browser { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle index c15cea8d38c..5883c109f4a 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle @@ -4,6 +4,7 @@ plugins { id 'org.jetbrains.kotlin.multiplatform' version 'KOTLIN_VERSION' id 'application' } + group = 'me.user' version = '1.0-SNAPSHOT' @@ -23,6 +24,7 @@ repositories { url 'https://dl.bintray.com/kotlin/kotlin-js-wrappers' } } + kotlin { jvm { compilations.all { @@ -85,17 +87,21 @@ kotlin { } } } + application { mainClassName = 'ServerKt' } + tasks.getByName('jsBrowserProductionWebpack') { outputFileName = 'output.js' } + tasks.getByName('jvmJar') { dependsOn(tasks.getByName('jsBrowserProductionWebpack')) def jsBrowserProductionWebpack = tasks.getByName('jsBrowserProductionWebpack') from(new File(jsBrowserProductionWebpack.destinationDirectory, jsBrowserProductionWebpack.outputFileName)) } + tasks.getByName('run') { dependsOn(tasks.getByName('jvmJar')) classpath(tasks.getByName('jvmJar')) diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts index 7374c4fda4e..a1f80b17f9d 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts @@ -4,6 +4,7 @@ plugins { kotlin("multiplatform") version "KOTLIN_VERSION" application } + group = "me.user" version = "1.0-SNAPSHOT" @@ -23,6 +24,7 @@ repositories { url = uri("https://dl.bintray.com/kotlin/kotlin-js-wrappers") } } + kotlin { jvm { compilations.all { @@ -83,17 +85,21 @@ kotlin { } } } + application { mainClassName = "ServerKt" } + tasks.getByName("jsBrowserProductionWebpack") { outputFileName = "output.js" } + tasks.getByName("jvmJar") { dependsOn(tasks.getByName("jsBrowserProductionWebpack")) val jsBrowserProductionWebpack = tasks.getByName("jsBrowserProductionWebpack") from(File(jsBrowserProductionWebpack.destinationDirectory, jsBrowserProductionWebpack.outputFileName)) } + tasks.getByName("run") { dependsOn(tasks.getByName("jvmJar")) classpath(tasks.getByName("jvmJar")) diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/build.gradle index 7ca68f3f7ba..9316a1242da 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/build.gradle @@ -1,6 +1,7 @@ plugins { id 'org.jetbrains.kotlin.multiplatform' version 'KOTLIN_VERSION' } + group = 'me.user' version = '1.0-SNAPSHOT' @@ -10,6 +11,7 @@ repositories { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } + kotlin { sourceSets { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/build.gradle.kts index 8d95ced8dd1..cbc37f05369 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/build.gradle.kts @@ -1,6 +1,7 @@ plugins { kotlin("multiplatform") version "KOTLIN_VERSION" } + group = "me.user" version = "1.0-SNAPSHOT" @@ -10,6 +11,7 @@ repositories { url = uri("https://dl.bintray.com/kotlin/kotlin-dev") } } + kotlin { sourceSets { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/build.gradle index c48cae255ec..c82f1f0ed26 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/build.gradle @@ -3,6 +3,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithTests plugins { id 'org.jetbrains.kotlin.multiplatform' version 'KOTLIN_VERSION' } + group = 'me.user' version = '1.0-SNAPSHOT' @@ -12,6 +13,7 @@ repositories { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } + kotlin { jvm { compilations.all { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/build.gradle.kts index ceba35c456e..374a7b31ff3 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/build.gradle.kts @@ -1,6 +1,7 @@ plugins { kotlin("multiplatform") version "KOTLIN_VERSION" } + group = "me.user" version = "1.0-SNAPSHOT" @@ -10,6 +11,7 @@ repositories { url = uri("https://dl.bintray.com/kotlin/kotlin-dev") } } + kotlin { jvm { compilations.all { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle index b886eb9534a..19a6fac9770 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle @@ -3,6 +3,7 @@ plugins { id 'org.jetbrains.kotlin.android' id 'kotlin-android-extensions' } + group = 'me.user' version = '1.0-SNAPSHOT' @@ -15,12 +16,14 @@ repositories { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } + dependencies { implementation project(':shared') implementation 'com.google.android.material:material:1.2.0' implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' } + android { compileSdkVersion 29 defaultConfig { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle.kts index d887350374f..8b480959c3a 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle.kts @@ -3,6 +3,7 @@ plugins { kotlin("android") id("kotlin-android-extensions") } + group = "me.user" version = "1.0-SNAPSHOT" @@ -15,12 +16,14 @@ repositories { url = uri("https://dl.bintray.com/kotlin/kotlin-dev") } } + dependencies { implementation(project(":shared")) implementation("com.google.android.material:material:1.2.0") implementation("androidx.appcompat:appcompat:1.2.0") implementation("androidx.constraintlayout:constraintlayout:1.1.3") } + android { compileSdkVersion(29) defaultConfig { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/build.gradle index 67e5cb638d6..f247f103e62 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/build.gradle @@ -12,6 +12,7 @@ buildscript { classpath('com.android.tools.build:gradle:4.0.1') } } + group = 'me.user' version = '1.0-SNAPSHOT' diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/build.gradle.kts index 644aafe721f..3a00c69828e 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/build.gradle.kts @@ -12,6 +12,7 @@ buildscript { classpath("com.android.tools.build:gradle:4.0.1") } } + group = "me.user" version = "1.0-SNAPSHOT" diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle index 8210dcd9490..ef16935a52a 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle @@ -5,6 +5,7 @@ plugins { id 'com.android.library' id 'kotlin-android-extensions' } + group = 'me.user' version = '1.0-SNAPSHOT' @@ -17,6 +18,7 @@ repositories { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } + kotlin { android() ios { @@ -55,6 +57,7 @@ kotlin { } } } + android { compileSdkVersion 29 sourceSets.main.manifest.srcFile('src/androidMain/AndroidManifest.xml') @@ -70,6 +73,7 @@ android { } } } + task(packForXcode, type: Sync) { group = 'build' def mode = System.getenv('CONFIGURATION') ?: 'DEBUG' @@ -82,4 +86,5 @@ task(packForXcode, type: Sync) { from({ framework.outputDirectory }) into(targetDir) } + tasks.getByName('build').dependsOn(packForXcode) \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle.kts index 82f0968615b..22907483085 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle.kts @@ -5,6 +5,7 @@ plugins { id("com.android.library") id("kotlin-android-extensions") } + group = "me.user" version = "1.0-SNAPSHOT" @@ -17,6 +18,7 @@ repositories { url = uri("https://dl.bintray.com/kotlin/kotlin-dev") } } + kotlin { android() ios { @@ -49,6 +51,7 @@ kotlin { val iosTest by getting } } + android { compileSdkVersion(29) sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") @@ -64,6 +67,7 @@ android { } } } + val packForXcode by tasks.creating(Sync::class) { group = "build" val mode = System.getenv("CONFIGURATION") ?: "DEBUG" @@ -76,4 +80,5 @@ val packForXcode by tasks.creating(Sync::class) { from({ framework.outputDirectory }) into(targetDir) } + tasks.getByName("build").dependsOn(packForXcode) \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle index 13d1be20f22..7c1c394f58c 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle @@ -3,6 +3,7 @@ plugins { id 'com.android.library' id 'kotlin-android-extensions' } + group = 'me.user' version = '1.0-SNAPSHOT' @@ -15,6 +16,7 @@ repositories { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } + kotlin { android() iosX64('ios') { @@ -53,6 +55,7 @@ kotlin { } } } + android { compileSdkVersion 29 sourceSets.main.manifest.srcFile('src/androidMain/AndroidManifest.xml') diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle.kts index d7e30592bb4..49ed8e89f06 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle.kts @@ -3,6 +3,7 @@ plugins { id("com.android.library") id("kotlin-android-extensions") } + group = "me.user" version = "1.0-SNAPSHOT" @@ -15,6 +16,7 @@ repositories { url = uri("https://dl.bintray.com/kotlin/kotlin-dev") } } + kotlin { android() iosX64("ios") { @@ -47,6 +49,7 @@ kotlin { val iosTest by getting } } + android { compileSdkVersion(29) sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/build.gradle index a86b11ae8be..4ba7bae293f 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/build.gradle @@ -3,6 +3,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithTests plugins { id 'org.jetbrains.kotlin.multiplatform' version 'KOTLIN_VERSION' } + group = 'me.user' version = '1.0-SNAPSHOT' @@ -12,6 +13,7 @@ repositories { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } + kotlin { def hostOs = System.getProperty("os.name") def isMingwX64 = hostOs.startsWith("Windows") diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/build.gradle.kts index 7032453d8c8..5c7ebac2666 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/build.gradle.kts @@ -1,6 +1,7 @@ plugins { kotlin("multiplatform") version "KOTLIN_VERSION" } + group = "me.user" version = "1.0-SNAPSHOT" @@ -10,6 +11,7 @@ repositories { url = uri("https://dl.bintray.com/kotlin/kotlin-dev") } } + kotlin { val hostOs = System.getProperty("os.name") val isMingwX64 = hostOs.startsWith("Windows") diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/BuildFileIR.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/BuildFileIR.kt index 7909c2b6ce8..54d22ebd9cc 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/BuildFileIR.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/BuildFileIR.kt @@ -46,8 +46,7 @@ data class BuildFileIR( is GradlePrinter -> { distinctImportsOrNull()?.let { imports -> imports.listNl() - nl() - nl() + nl(lineBreaks = 2) } irsOfTypeOrNull()?.let { buildScriptIrs -> sectionCall("buildscript", needIndent = true) { @@ -56,15 +55,15 @@ data class BuildFileIR( sectionCall("dependencies", buildScriptIrs.filterIsInstance()) } } - sectionCall("plugins", irsOfType()); nlIndented() + sectionCall("plugins", irsOfType()); nl(lineBreaks = 2) pom.render(this); nl() sectionCall("repositories", distinctRepositories()) - nl() + nl(lineBreaks = 2) modules.render(this) irsOfTypeOrNull()?.let { freeIrs -> - nl() - freeIrs.listNl() + nl(2) + freeIrs.listNl(lineBreaks = 2) }.ignore() } is MavenPrinter -> pom { diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/printer/BuildFilePrinter.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/printer/BuildFilePrinter.kt index f4ab8c09345..48ce7e28b25 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/printer/BuildFilePrinter.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/printer/BuildFilePrinter.kt @@ -13,9 +13,9 @@ abstract class BuildFilePrinter { +"\n".repeat(lineBreaks) } - fun nlIndented() { - nl(); - indent(); + fun nlIndented(lineBreaks: Int = 1) { + nl(lineBreaks) + indent() } fun indent() { @@ -53,9 +53,9 @@ abstract class BuildFilePrinter { suffix() } - open fun List.listNl(needFirstIndent: Boolean = true) { + open fun List.listNl(needFirstIndent: Boolean = true, lineBreaks: Int = 1) { if (needFirstIndent) indent() - list(separator = { nl(); indent() }) { it.render(this) } + list(separator = { nl(lineBreaks); indent() }) { it.render(this) } } fun result(): String = builder.toString() diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/printer/MavenPrinter.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/printer/MavenPrinter.kt index 332519d0ac0..ea48754ec62 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/printer/MavenPrinter.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/printer/MavenPrinter.kt @@ -37,8 +37,8 @@ MavenPrinter(override val indent: Int = 4) : BuildFilePrinter() { } // We already have line break after node - override fun List.listNl(needFirstIndent: Boolean) { - list(separator = { +"" }) { it.render(this) } + override fun List.listNl(needFirstIndent: Boolean, lineBreaks: Int) { + list(separator = { nl(lineBreaks = (lineBreaks - 1).coerceAtLeast(0)) }) { it.render(this) } } val String.quotified