Fix gradle build failure

Enable test aws-sdk-java-v2 Signed-off-by: Shubhendu Ram Tripathi <[email protected]>
minio · Apr 23, 2024 · 7f254d4 · 7f254d4
1 parent aa836bd
commit 7f254d4
Show file tree

Hide file tree

Showing 14 changed files with 8 additions and 0 deletions.
diff --git a/build/.aws-sdk-java-v2/.gitattributes → build/aws-sdk-java-v2/.gitattributes b/build/.aws-sdk-java-v2/.gitattributes → build/aws-sdk-java-v2/.gitattributes
diff --git a/build/.aws-sdk-java-v2/.gitignore → build/aws-sdk-java-v2/.gitignore b/build/.aws-sdk-java-v2/.gitignore → build/aws-sdk-java-v2/.gitignore
diff --git a/build/.aws-sdk-java-v2/app/build.gradle.kts → build/aws-sdk-java-v2/app/build.gradle.kts b/build/.aws-sdk-java-v2/app/build.gradle.kts → build/aws-sdk-java-v2/app/build.gradle.kts
diff --git a/...inio/awssdk/v2/tests/FunctionalTests.java → ...inio/awssdk/v2/tests/FunctionalTests.java b/...inio/awssdk/v2/tests/FunctionalTests.java → ...inio/awssdk/v2/tests/FunctionalTests.java
diff --git a/...o/awssdk/v2/tests/LimitedInputStream.java → ...o/awssdk/v2/tests/LimitedInputStream.java b/...o/awssdk/v2/tests/LimitedInputStream.java → ...o/awssdk/v2/tests/LimitedInputStream.java
diff --git a/.../io/minio/awssdk/v2/tests/MintLogger.java → .../io/minio/awssdk/v2/tests/MintLogger.java b/.../io/minio/awssdk/v2/tests/MintLogger.java → .../io/minio/awssdk/v2/tests/MintLogger.java
diff --git a/...io/minio/awssdk/v2/tests/S3TestUtils.java → ...io/minio/awssdk/v2/tests/S3TestUtils.java b/...io/minio/awssdk/v2/tests/S3TestUtils.java → ...io/minio/awssdk/v2/tests/S3TestUtils.java
diff --git a/.../java/io/minio/awssdk/v2/tests/Utils.java → .../java/io/minio/awssdk/v2/tests/Utils.java b/.../java/io/minio/awssdk/v2/tests/Utils.java → .../java/io/minio/awssdk/v2/tests/Utils.java
diff --git a/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties b/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties
diff --git a/build/.aws-sdk-java-v2/gradlew → build/aws-sdk-java-v2/gradlew b/build/.aws-sdk-java-v2/gradlew → build/aws-sdk-java-v2/gradlew
diff --git a/build/.aws-sdk-java-v2/gradlew.bat → build/aws-sdk-java-v2/gradlew.bat b/build/.aws-sdk-java-v2/gradlew.bat → build/aws-sdk-java-v2/gradlew.bat
diff --git a/build/.aws-sdk-java-v2/install.sh → build/aws-sdk-java-v2/install.sh b/build/.aws-sdk-java-v2/install.sh → build/aws-sdk-java-v2/install.sh
@@ -19,6 +19,7 @@ test_run_dir="$MINT_RUN_CORE_DIR/aws-sdk-java-v2"
 
 cd "$(dirname "$(realpath "$0")")"
 
+/opt/gradle/gradle-8.5/bin/gradle wrapper
 ./gradlew clean build
 
 cp app/build/libs/FunctionalTests.jar "$test_run_dir/"

diff --git a/build/.aws-sdk-java-v2/settings.gradle.kts → build/aws-sdk-java-v2/settings.gradle.kts b/build/.aws-sdk-java-v2/settings.gradle.kts → build/aws-sdk-java-v2/settings.gradle.kts
diff --git a/preinstall.sh b/preinstall.sh
@@ -18,6 +18,13 @@
 export APT="apt --quiet --yes"
 export WGET="wget --quiet --no-check-certificate"
 
+# install gradle
+$APT install unzip
+$WGET -O gradle-8.5-bin.zip https://services.gradle.org/distributions/gradle-8.5-bin.zip
+mkdir /opt/gradle
+unzip -qq -d /opt/gradle gradle-8.5-bin.zip
+export PATH=$PATH:/opt/gradle/gradle-8.5/bin
+
 # install nodejs source list
 if ! $WGET --output-document=- https://deb.nodesource.com/setup_20.x | bash -; then
 	echo "unable to set nodejs repository"