forked from bitcoin-wallet/bitcoin-wallet
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "ci: update build settings for Android 34 build tools"
This reverts commit 985c6d1.
- Loading branch information
1 parent
e80a10c
commit 05e0fff
Showing
2 changed files
with
6 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,13 +31,13 @@ jobs: | |
| - name: Setup Android SDK | ||
| uses: android-actions/[email protected] | ||
|
|
||
| - name: Install build-tools 34.0.2, platformtools and platform android-33 | ||
| run: sdkmanager --install "build-tools;34.0.0" "platform-tools" "platforms;android-34" | ||
| - name: Install build-tools 33.0.2, platformtools and platform android-33 | ||
| run: sdkmanager --install "build-tools;33.0.2" "platform-tools" "platforms;android-33" | ||
|
|
||
| - name: Fix build tools 33.0.2 issue | ||
| run: | | ||
| ln -s ${ANDROID_HOME}/build-tools/34.0.0/d8 ${ANDROID_HOME}/build-tools/34.0.0/dx | ||
| ln -s ${ANDROID_HOME}/build-tools/34.0.0/lib/d8.jar ${ANDROID_HOME}/build-tools/34.0.0/lib/dx.jar | ||
| ln -s ${ANDROID_HOME}/build-tools/33.0.2/d8 ${ANDROID_HOME}/build-tools/33.0.2/dx | ||
| ln -s ${ANDROID_HOME}/build-tools/33.0.2/lib/d8.jar ${ANDROID_HOME}/build-tools/33.0.2/lib/dx.jar | ||
| - name: Build with Gradle | ||
| run: | | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,8 +25,8 @@ jobs: | |
| - name: Setup Android SDK | ||
| uses: android-actions/[email protected] | ||
|
|
||
| - name: Install build-tools 34.0.0, platformtools and platform android-34 | ||
| run: sdkmanager --install "build-tools;34.0.0" "platform-tools" "platforms;android-34" | ||
| - name: Install build-tools 33.0.2, platformtools and platform android-33 | ||
| run: sdkmanager --install "build-tools;33.0.2" "platform-tools" "platforms;android-33" | ||
|
|
||
| - name: Build with Gradle | ||
| run: | | ||
|
|
||