From 9efab1d1dc9746da6d779708ad889ffc7df482b4 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 14 Feb 2021 21:33:20 +0600 Subject: [PATCH] renames of gradle scripts and using of IR in JVM --- defaultAndroidSettings => defaultAndroidSettings.gradle | 0 extensions.gradle | 8 ++++---- mppAndroidProject => mppAndroidProject.gradle | 0 mppJavaProject => mppJavaProject.gradle | 4 +++- ...ithSerialization => mppProjectWithSerialization.gradle | 4 +++- 5 files changed, 10 insertions(+), 6 deletions(-) rename defaultAndroidSettings => defaultAndroidSettings.gradle (100%) rename mppAndroidProject => mppAndroidProject.gradle (100%) rename mppJavaProject => mppJavaProject.gradle (89%) rename mppProjectWithSerialization => mppProjectWithSerialization.gradle (94%) diff --git a/defaultAndroidSettings b/defaultAndroidSettings.gradle similarity index 100% rename from defaultAndroidSettings rename to defaultAndroidSettings.gradle diff --git a/extensions.gradle b/extensions.gradle index fd1f470..0c108ed 100644 --- 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" } diff --git a/mppAndroidProject b/mppAndroidProject.gradle similarity index 100% rename from mppAndroidProject rename to mppAndroidProject.gradle diff --git a/mppJavaProject b/mppJavaProject.gradle similarity index 89% rename from mppJavaProject rename to mppJavaProject.gradle index 79f0805..aa9cc2c 100644 --- a/mppJavaProject +++ b/mppJavaProject.gradle @@ -4,7 +4,9 @@ project.group = "$group" // apply from: "$publishGradlePath" kotlin { - jvm() + jvm { + compilations.main.kotlinOptions.useIR = true + } sourceSets { commonMain { diff --git a/mppProjectWithSerialization b/mppProjectWithSerialization.gradle similarity index 94% rename from mppProjectWithSerialization rename to mppProjectWithSerialization.gradle index be201a9..26e5929 100644 --- a/mppProjectWithSerialization +++ 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()