Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minsdk 24 & targetsdk 33 updated #495

Merged
merged 6 commits into from
Aug 23, 2023
Merged

Minsdk 24 & targetsdk 33 updated #495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e662971
fix: new zingolib - sync spped up
juanky201271 Aug 21, 2023
352109e
fix: downgrade Android NDK to r21e
juanky201271 Aug 22, 2023
62cc6b9
fix: minsdk 24 & targetsdk 33 updated
juanky201271 Aug 22, 2023
d71807a
fix: new docker image 003
juanky201271 Aug 22, 2023
f83cdbe
fix: minor fix
juanky201271 Aug 22, 2023
8c0f731
fix: ci openssl version fixed
juanky201271 Aug 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
if: ${{ needs.check-build-cache.outputs.cache-found == 'failure' }}
runs-on: ubuntu-22.04
container:
image: zingodevops/android_builder:001
image: zingodevops/android_builder:003
env:
RUSTUP_HOME: /root/.rustup
steps:
Expand Down Expand Up @@ -125,7 +125,7 @@ jobs:
LD: ld
RANLIB: llvm-ranlib
CC: ${{ env.CC }}23-clang
OPENSSL_DIR: /opt/openssl-3.0.5/${{ env.OPENSSL_PATH }}
OPENSSL_DIR: /opt/openssl-3.1.2/${{ env.OPENSSL_PATH }}

- name: LLVM Strip
working-directory: ./rust/target
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create-cache-key.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
name: Create cache key
runs-on: ubuntu-22.04
container:
image: zingodevops/android_builder:001
image: zingodevops/android_builder:003
env:
RUSTUP_HOME: /root/.rustup
outputs:
Expand Down
10 changes: 5 additions & 5 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
buildscript {
ext {
buildToolsVersion = "31.0.0"
minSdkVersion = 23
compileSdkVersion = 31
targetSdkVersion = 31
ndkVersion = "25.2.9519653"
kotlinVersion = '1.7.10'
minSdkVersion = 24
compileSdkVersion = 33
targetSdkVersion = 33
ndkVersion = "21.4.7075529" //"25.2.9519653"
kotlinVersion = '1.8.0'
}
repositories {
google()
Expand Down
Loading