diff --git a/docker-compose.yml b/docker-compose.yml index 960f4aa..708c04d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,4 +20,3 @@ services: - repo volumes: - ./package-list.yaml:/package-list.yaml - - ./data/gradle:/gradle-download diff --git a/package-list.yaml b/package-list.yaml index 2461772..13f1f41 100644 --- a/package-list.yaml +++ b/package-list.yaml @@ -12,7 +12,7 @@ maven: configurations: # Specify configurations where the packages/plugins depend on a specific kotlin and/or gradle version. - kotlin-version: ["latest", "1.8.20", "1.7.0"] - gradle-version: ["8.2.1", "7.6.2"] + gradle-version: ["latest", "8.2.1", "7.6.2"] plugins: "`kotlin-dsl`": null diff --git a/sync/resolve-deps.sh b/sync/resolve-deps.sh index 89f5a35..9058a92 100755 --- a/sync/resolve-deps.sh +++ b/sync/resolve-deps.sh @@ -51,25 +51,11 @@ fi if [ $? -lt 30 ]; then for path in "$PROJECTS_DIR"/*; do version=$(basename "${path}") - gradle_path=${GRADLE_VERSIONS_DIR}/gradle-${version} if [[ "${version}" == "default" ]]; then - gradle_path=${GRADLE_HOME} - elif [[ ! -d "${gradle_path}" ]]; then - filename="gradle-${version}-bin.zip" - zippath="${GRADLE_DOWNLOAD_DIR}/${filename}" - - if [[ ! -f "${zippath}" ]]; then - echo "Downloading gradle ${version}" - wget "https://services.gradle.org/distributions/${filename}" -O "${GRADLE_DOWNLOAD_DIR}/${filename}" - - if [[ ! -f "${zippath}" ]]; then - echo "ERROR: Could not fetch gradle ${version}" - continue - fi - fi - - unzip -q "${zippath}" -d "${GRADLE_VERSIONS_DIR}" + wrapper_flags="" + else + wrapper_flags="--gradle-version ${version}" fi for project in "${path}"/*; do @@ -77,8 +63,11 @@ if [ $? -lt 30 ]; then echo "Running $project" cat "$project/build.gradle.kts" + echo "-----------------------Generating wrapper-------------------------------" + (cd "$project" && gradle wrapper ${wrapper_flags}) + echo "-----------------------Running gradle------------------------------------" - (cd "$project" && "${gradle_path}/bin/gradle" --info -Dorg.gradle.jvmargs=-Xms4096m downloadDependencies) + (cd "$project" && ./gradlew --info -Dorg.gradle.jvmargs=-Xms4096m downloadDependencies) done done else