renames of gradle scripts and using of IR in JVM

2021-02-14 21:33:20 +06:00 · 2021-02-14 21:33:20 +06:00 · 9efab1d1dc
parent 171b4f89f9
commit 9efab1d1dc
5 changed files with 10 additions and 6 deletions
--- a/defaultAndroidSettings.gradle
+++ b/defaultAndroidSettings.gradle
--- a/extensions.gradle
+++ b/extensions.gradle
@ -13,11 +13,11 @@ allprojects {
            projectByName(name)
        }

-        mppProjectWithSerializationPresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerialization"
-        mppJavaProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJavaProject"
-        mppAndroidProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppAndroidProject"
+        mppProjectWithSerializationPresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerialization.gradle"
+        mppJavaProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJavaProject.gradle"
+        mppAndroidProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppAndroidProject.gradle"

-        defaultAndroidSettingsPresetPath = "${rootProject.projectDir.absolutePath}/defaultAndroidSettings"
+        defaultAndroidSettingsPresetPath = "${rootProject.projectDir.absolutePath}/defaultAndroidSettings.gradle"

        // publishGradlePath = "${rootProject.projectDir.absolutePath}/publish.gradle"
    }
--- a/mppAndroidProject.gradle
+++ b/mppAndroidProject.gradle
--- a/mppJavaProject.gradle
+++ b/mppJavaProject.gradle
@ -4,7 +4,9 @@ project.group = "$group"
 // apply from: "$publishGradlePath"

 kotlin {
-    jvm()
+    jvm {
+        compilations.main.kotlinOptions.useIR = true
+    }

    sourceSets {
        commonMain {
--- a/mppProjectWithSerialization.gradle
+++ b/mppProjectWithSerialization.gradle
@ -4,7 +4,9 @@ project.group = "$group"
 // apply from: "$publishGradlePath"

 kotlin {
-    jvm()
+    jvm {
+        compilations.main.kotlinOptions.useIR = true
+    }
    js (BOTH) {
        browser()
        nodejs()