Browse Source

Remove configuration scripts (#2259)

Because this configuration is done on androidx repo level now
pull/2260/head
Igor Demin 2 years ago committed by GitHub
parent
commit
598a74d03b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. BIN
      compose/external/tools.jar
  2. 1
      compose/scripts/buildNativeDemo
  3. 64
      compose/scripts/downloadAndroidSdk
  4. 9
      compose/scripts/prepare
  5. 1
      compose/scripts/publish
  6. 1
      compose/scripts/publishExtendedIcons
  7. 1
      compose/scripts/publishExtendedIconsToMavenLocal
  8. 1
      compose/scripts/publishToMavenLocal
  9. 1
      compose/scripts/reuploadArtifactsToMavenCentral
  10. 1
      compose/scripts/runGradle
  11. 1
      compose/scripts/testAll
  12. 4
      compose/scripts/testAndroidInEmulator.sh
  13. 4
      compose/scripts/testAndroidUnit.sh
  14. 1
      compose/scripts/testComposeModules
  15. 1
      compose/scripts/testDesktop
  16. 1
      compose/scripts/testRuntimeNative
  17. 1
      compose/scripts/testWeb

BIN
compose/external/tools.jar vendored

Binary file not shown.

1
compose/scripts/buildNativeDemo

@ -1,7 +1,6 @@
#!/bin/bash
cd "$(dirname "$0")"
. ./prepare
pushd ..
./gradlew buildNativeDemo $COMPOSE_DEFAULT_GRADLE_ARGS "$@" || exit 1

64
compose/scripts/downloadAndroidSdk

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

9
compose/scripts/prepare

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

1
compose/scripts/publish

@ -1,7 +1,6 @@
#!/bin/bash
cd "$(dirname "$0")"
. ./prepare
pushd ..
./gradlew publishComposeJb $COMPOSE_DEFAULT_GRADLE_ARGS "$@" || exit 1

1
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

1
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

1
compose/scripts/publishToMavenLocal

@ -1,7 +1,6 @@
#!/bin/bash
cd "$(dirname "$0")"
. ./prepare
pushd ..
./gradlew publishComposeJbToMavenLocal $COMPOSE_DEFAULT_GRADLE_ARGS "$@" || exit 1

1
compose/scripts/reuploadArtifactsToMavenCentral

@ -1,7 +1,6 @@
#!/bin/bash
cd "$(dirname "$0")"
. ./prepare
pushd ..
./gradlew reuploadArtifactsToMavenCentral $COMPOSE_DEFAULT_GRADLE_ARGS "$@" || exit 1

1
compose/scripts/runGradle

@ -1,7 +1,6 @@
#!/bin/bash
cd "$(dirname "$0")"
. ./prepare
pushd ..
./gradlew $COMPOSE_DEFAULT_GRADLE_ARGS "$@" || exit 1

1
compose/scripts/testAll

@ -1,7 +1,6 @@
#!/bin/bash
cd "$(dirname "$0")"
. ./prepare
pushd ..
./gradlew testComposeJbDesktop testComposeJbWeb $COMPOSE_DEFAULT_GRADLE_ARGS "$@" || exit 1

4
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" \

4
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 \

1
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

1
compose/scripts/testDesktop

@ -1,7 +1,6 @@
#!/bin/bash
cd "$(dirname "$0")"
. ./prepare
pushd ..
./gradlew testComposeJbDesktop $COMPOSE_DEFAULT_GRADLE_ARGS "$@" || exit 1

1
compose/scripts/testRuntimeNative

@ -1,7 +1,6 @@
#!/bin/bash
cd "$(dirname "$0")"
. ./prepare
pushd ..
./gradlew testRuntimeNative $COMPOSE_DEFAULT_GRADLE_ARGS "$@" || exit 1

1
compose/scripts/testWeb

@ -1,7 +1,6 @@
#!/bin/bash
cd "$(dirname "$0")"
. ./prepare
pushd ..
./gradlew testComposeJbWeb $COMPOSE_DEFAULT_GRADLE_ARGS "$@" || exit 1

Loading…
Cancel
Save