Skip to content

Commit

Permalink
Upgrade to API33/Gradle 7.4.2 (#3279)
Browse files Browse the repository at this point in the history
* Upgrade to API33/Gradle 7.4.2
* Update Java version
* Remove redundant XMLDSig Test
  • Loading branch information
JamesSmartCell authored Aug 29, 2023
1 parent b4f04a4 commit ed9df92
Show file tree
Hide file tree
Showing 24 changed files with 118 additions and 350 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v3
with:
distribution: zulu
java-version: 11
distribution: oracle
java-version: 17

- name: Run unit tests
run: sh ./build.sh
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v3
with:
distribution: zulu
java-version: 11
distribution: oracle
java-version: 17

- name: Run unit tests
run: sh ./build.sh
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v3
with:
distribution: zulu
java-version: 11
distribution: oracle
java-version: 17

- name: Run unit tests
run: sh ./build.sh
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v3
with:
distribution: zulu
java-version: 11
distribution: oracle
java-version: 17
architecture: x64

- uses: actions/setup-node@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
- name: set up JDK
uses: actions/setup-java@v3
with:
distribution: zulu
java-version: 11
distribution: oracle
java-version: 17
cache: gradle
- name: Run detekt
run: ./gradlew :app:detekt
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v3
with:
distribution: zulu
java-version: 11
distribution: oracle
java-version: 17
cache: gradle
- name: Run Kotlin lint
run: ./gradlew :app:detekt
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ app/noAnalytics/release/output.json
.gradle/
/build
app/release
app/CMakeFiles
app/debug
app/debug/output.json

Expand Down
4 changes: 2 additions & 2 deletions BUILD.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Build instruction
### NOTE: Use JDK11
- Android Gradle Plugin requires Java 11
### NOTE: Use JDK17
- Android Gradle Plugin requires Java 17
- Java 16 is not supported due to IllegalAccessError compile error when Realm tries to access the com.sun.tools.javac package

To build everything:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ gpr.key=The GitHub Personal Access Token you created in previous step
```
6. Build the project in AndroidStudio or Run `./gradlew build` to install tools and dependencies. See [BUILD.md](BUILD.md) for more details.

You can also build it from the commandline just like other Android apps. Note that JDK 8 and 11 are the versions supported by Android.
You can also build it from the commandline just like other Android apps. Note that JDK 17 is the version now supported by Android. We build with the JetBrains JDK.

Find more information in our available [documentation](https://github.com/AlphaWallet/alpha-wallet-android/blob/master/docs/overview.md).

Expand Down
2 changes: 2 additions & 0 deletions app/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
/build
./CMakeCache.txt
/CMakeFiles
150 changes: 0 additions & 150 deletions app/CMakeCache.txt

This file was deleted.

15 changes: 0 additions & 15 deletions app/CMakeFiles/3.18.1-g262b901-dirty/CMakeSystem.cmake

This file was deleted.

1 change: 0 additions & 1 deletion app/CMakeFiles/cmake.check_cache

This file was deleted.

Loading

0 comments on commit ed9df92

Please sign in to comment.