From d448345bb5a60de230d34aae09bff14e6fb8eef0 Mon Sep 17 00:00:00 2001
From: Igor Demin <igordmn@users.noreply.github.com>
Date: Tue, 23 Aug 2022 21:09:52 +0300
Subject: [PATCH] Fix CI compilation (2) (#2261)

---
 .../buildSrc/src/main/kotlin/ComposeProperties.kt   |  2 +-
 compose/gradle.properties                           | 13 -------------
 compose/gradlew                                     |  4 +---
 compose/gradlew.bat                                 |  3 +--
 4 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 100644 compose/gradle.properties

diff --git a/compose/buildSrc/src/main/kotlin/ComposeProperties.kt b/compose/buildSrc/src/main/kotlin/ComposeProperties.kt
index 737a991939..24ca962be6 100644
--- a/compose/buildSrc/src/main/kotlin/ComposeProperties.kt
+++ b/compose/buildSrc/src/main/kotlin/ComposeProperties.kt
@@ -7,7 +7,7 @@ import org.gradle.api.*
 
 class ComposeProperties(private val myProject: Project) {
     val isOelPublication: Boolean
-        get() = myProject.findProperty("oel.publication") == "true"
+        get() = myProject.findProperty("oel.publication") != "false"
 
     val targetPlatforms: Set<ComposePlatforms>
         get() {
diff --git a/compose/gradle.properties b/compose/gradle.properties
deleted file mode 100644
index 899da2a10d..0000000000
--- a/compose/gradle.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-org.gradle.jvmargs=-Xmx8g -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC
-org.gradle.daemon=true
-org.gradle.configureondemand=true
-org.gradle.parallel=true
-org.gradle.caching=true
-org.gradle.vfs.watch=true
-androidx.compose.multiplatformEnabled=true
-jetbrains.compose.jsCompilerTestsEnabled=true
-androidx.validateProjectStructure=false
-# Enable kotlin/native experimental memory model
-kotlin.native.binary.memoryModel=experimental
-# Caching plays bad with skiko libraries
-kotlin.native.cacheKind=none
diff --git a/compose/gradlew b/compose/gradlew
index f44ab8d92b..6ed0e6aaaf 100755
--- a/compose/gradlew
+++ b/compose/gradlew
@@ -1,3 +1 @@
-pushd frameworks/support
-./gradlew "$@"
-popd
\ No newline at end of file
+./frameworks/support/gradlew "$@"
diff --git a/compose/gradlew.bat b/compose/gradlew.bat
index 8f1e5aace8..8dfe28dcc5 100644
--- a/compose/gradlew.bat
+++ b/compose/gradlew.bat
@@ -1,2 +1 @@
-cd frameworks/support
-gradlew.bat %*
\ No newline at end of file
+frameworks/support/gradlew.bat %*
\ No newline at end of file