Configure build on CI

compose/scripts/prepare

@@ -6,4 +6,4 @@ export ALLOW_PUBLIC_REPOS=1
 export JAVA_TOOLS_JAR=$SCRIPT_DIR/../external/tools.jar
 export ANDROIDX_PROJECTS=COMPOSE
 export COMPOSE_CUSTOM_GROUP=org.jetbrains.compose
-export COMPOSE_DEFAULT_GRADLE_ARGS="-Pandroidx.compose.multiplatformEnabled=true -Pandroidx.versionExtraCheckEnabled=false -Pandroidx.alternativeProjectUrl=https://github.com/JetBrains/compose-jb -Pandroidx.compose.jsCompilerTestsEnabled=true -Pandroidx.validateProjectStructure=false"
+export COMPOSE_DEFAULT_GRADLE_ARGS="-Pandroidx.compose.multiplatformEnabled=true -Pandroidx.versionExtraCheckEnabled=false -Pandroidx.alternativeProjectUrl=https://github.com/JetBrains/compose-jb -Pandroidx.compose.jsCompilerTestsEnabled=true -Pandroidx.validateProjectStructure=false -Pandroidx.compose.openExpectLiteMode=org_jetbrains"

compose/scripts/prepareAndroidx

@@ -0,0 +1,3 @@
+#!/bin/bash
+export COMPOSE_CUSTOM_GROUP=androidx.compose
+export COMPOSE_DEFAULT_GRADLE_ARGS="-Pandroidx.compose.openExpectLiteMode=androidx $COMPOSE_DEFAULT_GRADLE_ARGS"

compose/scripts/publish

@@ -6,3 +6,10 @@ cd "$(dirname "$0")"
 pushd ..
 ./gradlew publishComposeJb $COMPOSE_DEFAULT_GRADLE_ARGS "$@" || exit 1
 popd
+
+
+. ./prepareAndroidx
+
+pushd ..
+./gradlew publishComposeJb $COMPOSE_DEFAULT_GRADLE_ARGS "$@" || exit 1
+popd

compose/scripts/publishExtendedIcons

@@ -6,3 +6,10 @@ cd "$(dirname "$0")"
 pushd ..
 ./gradlew publishComposeJbExtendedIcons $COMPOSE_DEFAULT_GRADLE_ARGS --max-workers=1 "$@" || exit 1
 popd
+
+
+. ./prepareAndroidx
+
+pushd ..
+./gradlew publishComposeJbExtendedIcons $COMPOSE_DEFAULT_GRADLE_ARGS --max-workers=1 "$@" || exit 1
+popd

compose/scripts/publishWithoutInspector

@@ -10,3 +10,10 @@ cd "$(dirname "$0")"
 pushd ..
 ./gradlew publishComposeJb $COMPOSE_DEFAULT_GRADLE_ARGS -x :support:compose:ui:ui-inspection:assembleInspectorJarRelease -x :support:compose:ui:ui-inspection:dexInspectorRelease "$@" || exit 1
 popd
+
+
+. ./prepareAndroidx
+
+pushd ..
+./gradlew publishComposeJb $COMPOSE_DEFAULT_GRADLE_ARGS -x :support:compose:ui:ui-inspection:assembleInspectorJarRelease -x :support:compose:ui:ui-inspection:dexInspectorRelease "$@" || exit 1
+popd

gradle-plugins/buildSrc/src/main/kotlin/BuildProperties.kt

@@ -14,9 +14,9 @@ object BuildProperties {
     fun composeVersion(project: Project): String =
         System.getenv("COMPOSE_GRADLE_PLUGIN_COMPOSE_VERSION")
             ?: project.findProperty("compose.version") as String
-    fun composeAndroidxVersion(project: Project): String =
-        System.getenv("COMPOSE_ANDROIDX_VERSION")
-            ?: project.findProperty("compose.androidx.version") as String
+    fun composeAndroidxVersion(project: Project): String = composeVersion(project) // temporaly use the same version until we merge it to jb-main
+//        System.getenv("COMPOSE_ANDROIDX_VERSION")
+//            ?: project.findProperty("compose.androidx.version") as String
     fun deployVersion(project: Project): String =
         System.getenv("COMPOSE_GRADLE_PLUGIN_VERSION")
             ?: project.findProperty("deploy.version") as String