From 816acaadc33b1fb66f2048473b63f7ccbfa9d29c Mon Sep 17 00:00:00 2001 From: Pavel Punegov Date: Wed, 19 Jan 2022 17:25:16 +0300 Subject: [PATCH] [K/N][samples] Properly disable HMPP for ^KT-50547 Properties file inside subproject isn't read. Moved to root Fixup to 8d0b511e95e31fe26ad641efe75b907927e429f8 --- kotlin-native/samples/echoServer/gradle.properties | 4 ---- kotlin-native/samples/gradle.properties | 5 ++++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/kotlin-native/samples/echoServer/gradle.properties b/kotlin-native/samples/echoServer/gradle.properties index 64c0426241f..790a07d5124 100644 --- a/kotlin-native/samples/echoServer/gradle.properties +++ b/kotlin-native/samples/echoServer/gradle.properties @@ -1,6 +1,2 @@ kotlin.code.style=official kotlin.import.noCommonSourceSets=true - -# Disable HMPP with metadata until KT-50547 is not fixed -kotlin.mpp.enableGranularSourceSetsMetadata=false -kotlin.mpp.hierarchicalStructureSupport=false \ No newline at end of file diff --git a/kotlin-native/samples/gradle.properties b/kotlin-native/samples/gradle.properties index 3fa394b80ed..9797a2a5ffc 100644 --- a/kotlin-native/samples/gradle.properties +++ b/kotlin-native/samples/gradle.properties @@ -15,4 +15,7 @@ kotlin_version=1.6.0 kotlin.native.home=../../dist # Increase memory for in-process compiler execution. -org.gradle.jvmargs=-Xmx3g \ No newline at end of file +org.gradle.jvmargs=-Xmx3g + +# Disable HMPP with metadata until KT-50547 is not fixed +kotlin.mpp.hierarchicalStructureSupport=false \ No newline at end of file