Skip to content

Commit

Permalink
android: update android gradle plugin to version 8.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
scribam authored and flyinghead committed Jun 12, 2023
1 parent d6fe466 commit bee5349
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 15 deletions.
16 changes: 7 additions & 9 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,19 @@ jobs:
with:
fetch-depth: 0
submodules: true

- uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'
cache: 'gradle'

- uses: actions/cache@v3
with:
path: ~/.ccache
key: android-ccache-${{ github.sha }}
restore-keys: android-ccache-

- uses: actions/cache@v3
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: android-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: android-gradle-

- name: Gradle
working-directory: shell/android-studio
run: ./gradlew assembleRelease --parallel
Expand All @@ -52,7 +50,7 @@ jobs:
- name: Extract symbols
run: |
DUMP_SYMS=./core/deps/breakpad/bin/dump_syms
SO_DIR=shell/android-studio/flycast/build/intermediates/cmake/release/obj
SO_DIR=shell/android-studio/flycast/build/intermediates/merged_native_libs/release/out/lib
for arch in arm64-v8a armeabi-v7a x86 x86_64 ; do
$DUMP_SYMS $SO_DIR/$arch/libflycast.so > libflycast.so.sym
BUILD_ID=`head -1 libflycast.so.sym | awk '{ print $4 }'`
Expand Down
4 changes: 2 additions & 2 deletions shell/android-studio/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id 'com.android.application' version '7.4.2' apply false
id 'com.android.library' version '7.4.2' apply false
id 'com.android.application' version '8.0.2' apply false
id 'com.android.library' version '8.0.2' apply false
}

task clean(type: Delete) {
Expand Down
1 change: 1 addition & 0 deletions shell/android-studio/flycast/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ def getSentryUrl = { ->

android {
namespace 'com.reicast.emulator'
ndkVersion '23.1.7779620'
compileSdk 29

defaultConfig {
Expand Down
6 changes: 3 additions & 3 deletions shell/android-studio/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Jan 13 13:20:45 CET 2023
#Mon Jun 05 22:55:18 CEST 2023
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion shell/android-studio/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
pluginManagement {
repositories {
gradlePluginPortal()
google()
mavenCentral()
gradlePluginPortal()
}
}
dependencyResolutionManagement {
Expand Down

0 comments on commit bee5349

Please sign in to comment.