diff --git a/.github/actions/android-app-setup/action.yml b/.github/actions/android-app-setup/action.yml index ac639c1..58b98b1 100644 --- a/.github/actions/android-app-setup/action.yml +++ b/.github/actions/android-app-setup/action.yml @@ -20,15 +20,6 @@ inputs: app-module: description: 'The Gradle app module (e.g. "app" or "android:androidApp").' required: true - maven-proxy-url: - description: 'Artifactory URL (with /android suffix) for the Maven proxy.' - required: true - maven-proxy-username: - description: 'Artifactory username for Maven proxy authentication.' - required: true - maven-proxy-password: - description: 'Artifactory password for Maven proxy authentication.' - required: true gradle-cache-job-id: description: 'Job ID for Gradle cache scoping (e.g. JDK version + module).' required: true @@ -60,9 +51,6 @@ runs: use-git-lfs: ${{ inputs.use-git-lfs }} jdk: ${{ inputs.jdk }} setup-rust: ${{ inputs.setup-rust }} - maven-proxy-url: ${{ inputs.maven-proxy-url }} - maven-proxy-username: ${{ inputs.maven-proxy-username }} - maven-proxy-password: ${{ inputs.maven-proxy-password }} gradle-cache-job-id: ${{ inputs.gradle-cache-job-id }} - name: Set Build Variables diff --git a/.github/actions/android-base-setup/action.yml b/.github/actions/android-base-setup/action.yml index fe1c052..dee8743 100644 --- a/.github/actions/android-base-setup/action.yml +++ b/.github/actions/android-base-setup/action.yml @@ -1,8 +1,7 @@ name: Setup Android Environment description: > Base setup for Android CI jobs. Checks out the repository, sets up a JDK, - configures the Maven proxy, sets up the Gradle cache, - and optionally sets up the Rust toolchain. + sets up the Gradle cache, and optionally sets up the Rust toolchain. inputs: checkout-token: @@ -17,15 +16,6 @@ inputs: setup-rust: description: 'Whether to set up the Rust toolchain.' required: true - maven-proxy-url: - description: 'Artifactory URL (with /android suffix) for the Maven proxy.' - required: true - maven-proxy-username: - description: 'Artifactory username for Maven proxy authentication.' - required: true - maven-proxy-password: - description: 'Artifactory password for Maven proxy authentication.' - required: true gradle-cache-job-id: description: 'Job ID for Gradle cache scoping (e.g. JDK version + module).' required: true @@ -47,13 +37,6 @@ runs: distribution: 'zulu' java-version: ${{ inputs.jdk }} - - name: Setup Maven Proxy - uses: UbiqueInnovation/actions-android/.github/actions/maven-proxy-setup@v2 - with: - maven-proxy-url: ${{ inputs.maven-proxy-url }} - maven-proxy-username: ${{ inputs.maven-proxy-username }} - maven-proxy-password: ${{ inputs.maven-proxy-password }} - - name: Setup Gradle Cache uses: UbiqueInnovation/actions-android/.github/actions/gradle-cache-setup@v2 with: diff --git a/.github/actions/maven-proxy-setup/action.yml b/.github/actions/maven-proxy-setup/action.yml deleted file mode 100644 index 4fdf04a..0000000 --- a/.github/actions/maven-proxy-setup/action.yml +++ /dev/null @@ -1,51 +0,0 @@ -name: Setup Ubique Maven Proxy -description: Installs a Gradle init script that adds the Ubique public Maven proxy to all projects and plugins - -inputs: - maven-proxy-url: - description: Artifactory URL (with /android suffix, which will be replaced with /remote-merged-maven) - required: true - maven-proxy-username: - description: Artifactory username for Maven proxy authentication - required: true - maven-proxy-password: - description: Artifactory password for Maven proxy authentication - required: true - -runs: - using: composite - steps: - - name: Install Gradle init script for Maven proxy - if: ${{ inputs.maven-proxy-url != '' && inputs.maven-proxy-username != '' && inputs.maven-proxy-password != '' }} - shell: bash - env: - ARTIFACTORY_URL: ${{ inputs.maven-proxy-url }} - ARTIFACTORY_USERNAME: ${{ inputs.maven-proxy-username }} - ARTIFACTORY_PASSWORD: ${{ inputs.maven-proxy-password }} - run: | - mkdir -p ~/.gradle/init.d - PROXY_URL=$(echo "$ARTIFACTORY_URL" | sed 's|/android|/remote-merged-maven|') - cat > ~/.gradle/init.d/ubique-maven-proxy.gradle << EOF - def proxy = { repo -> - repo.maven { - url = "${PROXY_URL}" - credentials { - username = '${ARTIFACTORY_USERNAME}' - password = '${ARTIFACTORY_PASSWORD}' - } - authentication { - basic(BasicAuthentication) - digest(DigestAuthentication) - } - } - } - beforeSettings { settings -> - settings.pluginManagement { - repositories { proxy(delegate) } - } - settings.dependencyResolutionManagement { - repositoriesMode.set(RepositoriesMode.PREFER_PROJECT) - repositories { proxy(delegate) } - } - } - EOF diff --git a/.github/workflows/android_build_alpaka_upload.yml b/.github/workflows/android_build_alpaka_upload.yml index 99dcbd0..7131ca1 100644 --- a/.github/workflows/android_build_alpaka_upload.yml +++ b/.github/workflows/android_build_alpaka_upload.yml @@ -113,9 +113,6 @@ jobs: setup-rust: ${{ inputs.setup-rust }} flavor: ${{ inputs.flavor }} app-module: ${{ inputs.app-module }} - maven-proxy-url: ${{ secrets.UB_ARTIFACTORY_URL_ANDROID }} - maven-proxy-username: ${{ secrets.UB_ARTIFACTORY_USER }} - maven-proxy-password: ${{ secrets.UB_ARTIFACTORY_PASSWORD }} gradle-cache-job-id: '${{ inputs.jdk }}-${{ inputs.app-module }}' - name: Setup SSH @@ -194,9 +191,6 @@ jobs: setup-rust: false flavor: ${{ inputs.flavor }} app-module: ${{ inputs.app-module }} - maven-proxy-url: ${{ secrets.UB_ARTIFACTORY_URL_ANDROID }} - maven-proxy-username: ${{ secrets.UB_ARTIFACTORY_USER }} - maven-proxy-password: ${{ secrets.UB_ARTIFACTORY_PASSWORD }} gradle-cache-job-id: '${{ inputs.jdk }}-${{ inputs.app-module }}' - name: Setup SSH diff --git a/.github/workflows/android_build_store_upload.yml b/.github/workflows/android_build_store_upload.yml index 273c638..eb039c6 100644 --- a/.github/workflows/android_build_store_upload.yml +++ b/.github/workflows/android_build_store_upload.yml @@ -96,9 +96,6 @@ jobs: setup-rust: ${{ inputs.setup-rust }} flavor: ${{ inputs.flavor }} app-module: ${{ inputs.app-module }} - maven-proxy-url: ${{ secrets.UB_ARTIFACTORY_URL_ANDROID }} - maven-proxy-username: ${{ secrets.UB_ARTIFACTORY_USER }} - maven-proxy-password: ${{ secrets.UB_ARTIFACTORY_PASSWORD }} gradle-cache-job-id: '${{ inputs.jdk }}-${{ inputs.app-module }}' # Build the app @@ -160,9 +157,6 @@ jobs: setup-rust: false flavor: ${{ inputs.flavor }} app-module: ${{ inputs.app-module }} - maven-proxy-url: ${{ secrets.UB_ARTIFACTORY_URL_ANDROID }} - maven-proxy-username: ${{ secrets.UB_ARTIFACTORY_USER }} - maven-proxy-password: ${{ secrets.UB_ARTIFACTORY_PASSWORD }} gradle-cache-job-id: '${{ inputs.jdk }}-${{ inputs.app-module }}' - name: Unstash app bundle diff --git a/.github/workflows/android_code_quality.yml b/.github/workflows/android_code_quality.yml index ced1b4d..21b84f9 100644 --- a/.github/workflows/android_code_quality.yml +++ b/.github/workflows/android_code_quality.yml @@ -103,9 +103,6 @@ jobs: setup-rust: ${{ inputs.setup-rust }} flavor: ${{ inputs.flavor }} app-module: ${{ inputs.app-module }} - maven-proxy-url: ${{ secrets.UB_ARTIFACTORY_URL_ANDROID }} - maven-proxy-username: ${{ secrets.UB_ARTIFACTORY_USER }} - maven-proxy-password: ${{ secrets.UB_ARTIFACTORY_PASSWORD }} gradle-cache-job-id: '${{ inputs.jdk }}-${{ inputs.app-module }}' # Set Gradle properties for reuse in multiple steps @@ -168,9 +165,6 @@ jobs: setup-rust: ${{ inputs.setup-rust }} flavor: ${{ inputs.flavor }} app-module: ${{ inputs.app-module }} - maven-proxy-url: ${{ secrets.UB_ARTIFACTORY_URL_ANDROID }} - maven-proxy-username: ${{ secrets.UB_ARTIFACTORY_USER }} - maven-proxy-password: ${{ secrets.UB_ARTIFACTORY_PASSWORD }} gradle-cache-job-id: '${{ inputs.jdk }}-${{ inputs.app-module }}' # Set Gradle properties for reuse in multiple steps diff --git a/.github/workflows/android_gradle_task.yml b/.github/workflows/android_gradle_task.yml index 0489924..f7b853b 100644 --- a/.github/workflows/android_gradle_task.yml +++ b/.github/workflows/android_gradle_task.yml @@ -71,9 +71,6 @@ jobs: use-git-lfs: ${{ inputs.use-git-lfs }} jdk: ${{ inputs.jdk }} setup-rust: 'false' - maven-proxy-url: '${{ secrets.UB_ARTIFACTORY_URL }}${{ secrets.UB_ARTIFACTORY_REPO_ANDROID }}' - maven-proxy-username: ${{ secrets.UB_ARTIFACTORY_USER }} - maven-proxy-password: ${{ secrets.UB_ARTIFACTORY_PASSWORD }} gradle-cache-job-id: '${{ inputs.jdk }}-${{ inputs.task }}' - name: Run Gradle task diff --git a/.github/workflows/android_library_artifactory.yml b/.github/workflows/android_library_artifactory.yml index 5105504..1f06db0 100644 --- a/.github/workflows/android_library_artifactory.yml +++ b/.github/workflows/android_library_artifactory.yml @@ -67,9 +67,6 @@ jobs: use-git-lfs: ${{ inputs.use-git-lfs }} jdk: ${{ inputs.jdk }} setup-rust: ${{ inputs.setup-rust }} - maven-proxy-url: ${{ secrets.UB_ARTIFACTORY_URL_ANDROID }} - maven-proxy-username: ${{ secrets.UB_ARTIFACTORY_USER }} - maven-proxy-password: ${{ secrets.UB_ARTIFACTORY_PASSWORD }} gradle-cache-job-id: '${{ inputs.jdk }}-${{ inputs.lib-module }}' # Append version name suffix