diff --git a/compose/external/tools.jar b/compose/external/tools.jar deleted file mode 100644 index 3c66d15fee..0000000000 Binary files a/compose/external/tools.jar and /dev/null differ diff --git a/compose/scripts/buildNativeDemo b/compose/scripts/buildNativeDemo index 0dec37eab3..9f3e53f968 100755 --- a/compose/scripts/buildNativeDemo +++ b/compose/scripts/buildNativeDemo @@ -1,7 +1,6 @@ #!/bin/bash cd "$(dirname "$0")" -. ./prepare pushd .. ./gradlew buildNativeDemo $COMPOSE_DEFAULT_GRADLE_ARGS "$@" || exit 1 diff --git a/compose/scripts/downloadAndroidSdk b/compose/scripts/downloadAndroidSdk deleted file mode 100755 index ddc41a43e2..0000000000 --- a/compose/scripts/downloadAndroidSdk +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash - -cd "$(dirname "$0")" - -clone() { - mkdir -p $1 - pushd $1 - git init - git config advice.detachedHead false - git fetch --depth=1 $2 $3 - git checkout FETCH_HEAD - popd -} - -# Commit hashes and sdk versions from https://android.googlesource.com/platform/manifest/+/refs/heads/androidx-main/default.xml - -downloadLinuxSDK() { - clone ../prebuilts/fullsdk-linux/platforms/android-32 https://android.googlesource.com/platform/prebuilts/fullsdk/platforms/android-32 master - clone ../prebuilts/fullsdk-linux/sources/android-32 https://android.googlesource.com/platform/prebuilts/fullsdk/sources/android-32 master - clone ../prebuilts/fullsdk-linux/ndk https://android.googlesource.com/toolchain/prebuilts/ndk/r23 master - ln -s "$PWD/../prebuilts/fullsdk-linux/ndk" ../prebuilts/fullsdk-linux/ndk-bundle # prepare to update androidx submodule - clone ../prebuilts/fullsdk-linux/build-tools/30.0.3 https://android.googlesource.com/platform/prebuilts/fullsdk-linux/build-tools/30.0.3 master - clone ../prebuilts/fullsdk-linux/platform-tools https://android.googlesource.com/platform/prebuilts/fullsdk-linux/platform-tools master - clone ../prebuilts/fullsdk-linux/tools https://android.googlesource.com/platform/prebuilts/fullsdk-linux/tools master - clone ../prebuilts/fullsdk-linux/cmake https://android.googlesource.com/platform/prebuilts/cmake/linux-x86 master - clone ../prebuilts/fullsdk-linux/ninja https://android.googlesource.com/platform/prebuilts/ninja/linux-x86 master -} - -downloadMacOsSDK() { - clone ../prebuilts/fullsdk-darwin/platforms/android-32 https://android.googlesource.com/platform/prebuilts/fullsdk/platforms/android-32 master - clone ../prebuilts/fullsdk-darwin/sources/android-32 https://android.googlesource.com/platform/prebuilts/fullsdk/sources/android-32 master - clone ../prebuilts/fullsdk-darwin/ndk https://android.googlesource.com/toolchain/prebuilts/ndk-darwin/r23 master - ln -s "$PWD/../prebuilts/fullsdk-darwin/ndk" ../prebuilts/fullsdk-darwin/ndk-bundle # prepare to update androidx submodule - clone ../prebuilts/fullsdk-darwin/build-tools/30.0.3 https://android.googlesource.com/platform/prebuilts/fullsdk-darwin/build-tools/30.0.3 master - clone ../prebuilts/fullsdk-darwin/platform-tools https://android.googlesource.com/platform/prebuilts/fullsdk-darwin/platform-tools master - clone ../prebuilts/fullsdk-darwin/tools https://android.googlesource.com/platform/prebuilts/fullsdk-darwin/tools master - clone ../prebuilts/fullsdk-darwin/cmake https://android.googlesource.com/platform/prebuilts/cmake/darwin-x86 master - clone ../prebuilts/fullsdk-darwin/ninja https://android.googlesource.com/platform/prebuilts/ninja/darwin-x86 master -} - -setupNativeBuildTools() { - mkdir -p ../prebuilts/fullsdk-$1/native-build-tools/bin/ - pushd ../prebuilts/fullsdk-$1/native-build-tools/bin/ - ln -s ../../ninja/ninja . - ln -s ../../cmake/bin/cmake . - popd -} - -if [[ "$OSTYPE" == "linux-gnu"* ]]; then - downloadLinuxSDK - setupNativeBuildTools linux -elif [[ "$OSTYPE" == "darwin"* ]]; then - downloadMacOsSDK - setupNativeBuildTools darwin -elif [[ "$OSTYPE" == "cygwin" ]]; then - echo "Please download Android SDK manually (https://developer.android.com/studio)" -elif [[ "$OSTYPE" == "msys" ]]; then - echo "Please download Android SDK manually (https://developer.android.com/studio)" -elif [[ "$OSTYPE" == "win32" ]]; then - echo "Please download Android SDK manually (https://developer.android.com/studio)" -else - echo "Unknown OS" -fi - diff --git a/compose/scripts/prepare b/compose/scripts/prepare deleted file mode 100755 index c109ddad05..0000000000 --- a/compose/scripts/prepare +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" - -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 -Pjetbrains.compose.jsCompilerTestsEnabled=true -Pandroidx.validateProjectStructure=false" \ No newline at end of file diff --git a/compose/scripts/publish b/compose/scripts/publish index adbb4087bd..320cb7e5a6 100755 --- a/compose/scripts/publish +++ b/compose/scripts/publish @@ -1,7 +1,6 @@ #!/bin/bash cd "$(dirname "$0")" -. ./prepare pushd .. ./gradlew publishComposeJb $COMPOSE_DEFAULT_GRADLE_ARGS "$@" || exit 1 diff --git a/compose/scripts/publishExtendedIcons b/compose/scripts/publishExtendedIcons index 54dd4d0bbd..2af9ea81e2 100755 --- a/compose/scripts/publishExtendedIcons +++ b/compose/scripts/publishExtendedIcons @@ -1,7 +1,6 @@ #!/bin/bash cd "$(dirname "$0")" -. ./prepare pushd .. ./gradlew publishComposeJbExtendedIcons $COMPOSE_DEFAULT_GRADLE_ARGS --max-workers=1 "$@" || exit 1 diff --git a/compose/scripts/publishExtendedIconsToMavenLocal b/compose/scripts/publishExtendedIconsToMavenLocal index 1113cdf0f4..cad378acb1 100755 --- a/compose/scripts/publishExtendedIconsToMavenLocal +++ b/compose/scripts/publishExtendedIconsToMavenLocal @@ -1,7 +1,6 @@ #!/bin/bash cd "$(dirname "$0")" -. ./prepare pushd .. ./gradlew publishComposeJbExtendedIconsToMavenLocal $COMPOSE_DEFAULT_GRADLE_ARGS --max-workers=1 "$@" || exit 1 diff --git a/compose/scripts/publishToMavenLocal b/compose/scripts/publishToMavenLocal index 551a69f73e..7ea5a0c81f 100755 --- a/compose/scripts/publishToMavenLocal +++ b/compose/scripts/publishToMavenLocal @@ -1,7 +1,6 @@ #!/bin/bash cd "$(dirname "$0")" -. ./prepare pushd .. ./gradlew publishComposeJbToMavenLocal $COMPOSE_DEFAULT_GRADLE_ARGS "$@" || exit 1 diff --git a/compose/scripts/reuploadArtifactsToMavenCentral b/compose/scripts/reuploadArtifactsToMavenCentral index 0856aabfc8..7ab9c7909d 100755 --- a/compose/scripts/reuploadArtifactsToMavenCentral +++ b/compose/scripts/reuploadArtifactsToMavenCentral @@ -1,7 +1,6 @@ #!/bin/bash cd "$(dirname "$0")" -. ./prepare pushd .. ./gradlew reuploadArtifactsToMavenCentral $COMPOSE_DEFAULT_GRADLE_ARGS "$@" || exit 1 diff --git a/compose/scripts/runGradle b/compose/scripts/runGradle index 287bb586f2..f8af8648c6 100755 --- a/compose/scripts/runGradle +++ b/compose/scripts/runGradle @@ -1,7 +1,6 @@ #!/bin/bash cd "$(dirname "$0")" -. ./prepare pushd .. ./gradlew $COMPOSE_DEFAULT_GRADLE_ARGS "$@" || exit 1 diff --git a/compose/scripts/testAll b/compose/scripts/testAll index a6e9de101a..c186b262db 100755 --- a/compose/scripts/testAll +++ b/compose/scripts/testAll @@ -1,7 +1,6 @@ #!/bin/bash cd "$(dirname "$0")" -. ./prepare pushd .. ./gradlew testComposeJbDesktop testComposeJbWeb $COMPOSE_DEFAULT_GRADLE_ARGS "$@" || exit 1 diff --git a/compose/scripts/testAndroidInEmulator.sh b/compose/scripts/testAndroidInEmulator.sh index 498323df3d..cfeb438d2d 100755 --- a/compose/scripts/testAndroidInEmulator.sh +++ b/compose/scripts/testAndroidInEmulator.sh @@ -5,10 +5,6 @@ echo "First need to start android emulator or connect device" cd "$(dirname "$0")" cd ../frameworks/support -export JAVA_TOOLS_JAR="$PWD/../../external/tools.jar" -export ALLOW_PUBLIC_REPOS=1 -export ANDROIDX_PROJECTS=COMPOSE - select CURRENT_TASK in \ ":compose:animation:animation-core:animation-core-samples:connectedDebugAndroidTest" \ ":compose:animation:animation-core:connectedDebugAndroidTest" \ diff --git a/compose/scripts/testAndroidUnit.sh b/compose/scripts/testAndroidUnit.sh index e4d3b82f74..9928dcb9b3 100755 --- a/compose/scripts/testAndroidUnit.sh +++ b/compose/scripts/testAndroidUnit.sh @@ -3,10 +3,6 @@ cd "$(dirname "$0")" cd ../frameworks/support -export JAVA_TOOLS_JAR="$PWD/../../external/tools.jar" -export ALLOW_PUBLIC_REPOS=1 -export ANDROIDX_PROJECTS=COMPOSE - ../../gradlew --no-daemon \ -Pandroidx.compose.multiplatformEnabled=false \ -Pjetbrains.compose.jsCompilerTestsEnabled=false \ diff --git a/compose/scripts/testComposeModules b/compose/scripts/testComposeModules index 2b8f1a2ecb..86dcfd1df3 100755 --- a/compose/scripts/testComposeModules +++ b/compose/scripts/testComposeModules @@ -1,7 +1,6 @@ #!/bin/bash cd "$(dirname "$0")" -. ./prepare pushd .. # used in https://github.com/JetBrains/androidx/tree/jb-main/.github/workflows diff --git a/compose/scripts/testDesktop b/compose/scripts/testDesktop index 948fc2e42e..7f78d0a6b8 100755 --- a/compose/scripts/testDesktop +++ b/compose/scripts/testDesktop @@ -1,7 +1,6 @@ #!/bin/bash cd "$(dirname "$0")" -. ./prepare pushd .. ./gradlew testComposeJbDesktop $COMPOSE_DEFAULT_GRADLE_ARGS "$@" || exit 1 diff --git a/compose/scripts/testRuntimeNative b/compose/scripts/testRuntimeNative index 94d06d6b81..1695e3a449 100755 --- a/compose/scripts/testRuntimeNative +++ b/compose/scripts/testRuntimeNative @@ -1,7 +1,6 @@ #!/bin/bash cd "$(dirname "$0")" -. ./prepare pushd .. ./gradlew testRuntimeNative $COMPOSE_DEFAULT_GRADLE_ARGS "$@" || exit 1 diff --git a/compose/scripts/testWeb b/compose/scripts/testWeb index 958f7a7b97..871ee03808 100755 --- a/compose/scripts/testWeb +++ b/compose/scripts/testWeb @@ -1,7 +1,6 @@ #!/bin/bash cd "$(dirname "$0")" -. ./prepare pushd .. ./gradlew testComposeJbWeb $COMPOSE_DEFAULT_GRADLE_ARGS "$@" || exit 1