Browse Source

Fix CI compilation (2) (#2261)

pull/2264/head
Igor Demin 2 years ago committed by GitHub
parent
commit
d448345bb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      compose/buildSrc/src/main/kotlin/ComposeProperties.kt
  2. 13
      compose/gradle.properties
  3. 4
      compose/gradlew
  4. 3
      compose/gradlew.bat

2
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() {

13
compose/gradle.properties

@ -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

4
compose/gradlew vendored

@ -1,3 +1 @@
pushd frameworks/support
./gradlew "$@"
popd
./frameworks/support/gradlew "$@"

3
compose/gradlew.bat vendored

@ -1,2 +1 @@
cd frameworks/support
gradlew.bat %*
frameworks/support/gradlew.bat %*
Loading…
Cancel
Save