azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove usage of JVM target 1.6 from HierarchicalMppIT

Browse Source 
#KT-45165
This commit is contained in:
Alexander Udalov
2022-04-11 22:06:32 +02:00
parent ef6d30dd51
commit 04cba8d767
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-multi-modules/bottom-mpp/build.gradle
+11 -11
View File
@@ -15,11 +15,11 @@ kotlin {
kotlinOptions.jvmTarget = "1.8" kotlinOptions.jvmTarget = "1.8"
} }
} }
jvm("jvm16") { jvm("jvm9") {
attributes { attribute(complexLibAttribute, 'jvm16') } attributes { attribute(complexLibAttribute, 'jvm9') }
compilations.all { compilations.all {
kotlinOptions.jvmTarget = "1.6" kotlinOptions.jvmTarget = "9"
} }
} }
// This is for iPhone emulator // This is for iPhone emulator
@@ -53,14 +53,14 @@ kotlin {
} }
// creating a diamond // creating a diamond
jvmJavaJvm16Main { jvmJavaJvm9Main {
dependsOn commonMain dependsOn commonMain
dependencies { dependencies {
api project(":api-jvm") api project(":api-jvm")
} }
} }
jvmJavaJvm16Test { jvmJavaJvm9Test {
dependsOn commonTest dependsOn commonTest
} }
@@ -76,30 +76,30 @@ kotlin {
} }
// setting up the targets source sets // setting up the targets source sets
jvm16Main { jvm9Main {
dependencies { } dependencies { }
// connecting to the diamond // connecting to the diamond
dependsOn jvmJavaJvm16Main dependsOn jvmJavaJvm9Main
} }
jvm16Test { jvm9Test {
dependencies { } dependencies { }
// connecting to the diamond // connecting to the diamond
dependsOn jvmJavaJvm16Test dependsOn jvmJavaJvm9Test
} }
jvmWithJavaMain { jvmWithJavaMain {
dependencies { } dependencies { }
// connecting to the diamond // connecting to the diamond
dependsOn jvmJavaJvm16Main dependsOn jvmJavaJvm9Main
dependsOn jvmWithJavaiOSMain dependsOn jvmWithJavaiOSMain
} }
jvmWithJavaTest { jvmWithJavaTest {
dependencies { } dependencies { }
// connecting to the diamond // connecting to the diamond
dependsOn jvmJavaJvm16Test dependsOn jvmJavaJvm9Test
dependsOn jvmWithJavaiOSTest dependsOn jvmWithJavaiOSTest
} }
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-multi-modules/bottom-mpp/src/jvm16Main/kotlin/transitiveStory/midActual/commonSource/SomeMPPInTheCommon.kt → libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-multi-modules/bottom-mpp/src/jvm9Main/kotlin/transitiveStory/midActual/commonSource/SomeMPPInTheCommon.kt
+1 -1
View File
@@ -10,4 +10,4 @@ actual open class SomeMPPInTheCommon actual constructor() {
} }
actual val sourceSetName: String = "jvm16Main" actual val sourceSetName: String = "jvm9Main"