Skip to content

Commit 46369aa

Browse files
buberddsbuberdds
authored
Merge pull request #2249 from oasisprotocol/mz/capacitorV8
Upgrade Capacitor to v8
2 parents 47402a7 + 913cb9a commit 46369aa

18 files changed

Lines changed: 179 additions & 223 deletions

‎.changelog/2249.internal.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Upgrade Capacitor to v8

‎.github/workflows/ci-build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ jobs:
5757
- name: Accept SDK licenses
5858
if: github.event_name == 'push'
5959
run: yes | "$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager" --licenses
60-
# Capacitor v7 sets a deployment target of Android 15 (SDK 35)
60+
# Capacitor v8 targets SDK 36
6161
- name: Install SDK components
6262
if: github.event_name == 'push'
6363
run: |
64-
"$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager" "platform-tools" "platforms;android-35" "build-tools;35.0.0"
64+
"$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager" "platform-tools" "platforms;android-36" "build-tools;36.0.0"
6565
- name: Build Android App Bundle (AAB)
6666
if: github.event_name == 'push'
6767
run: ./gradlew bundleRelease -PversionCodeOverride=${{ steps.vars.outputs.VERSION_CODE_OVERRIDE }}
@@ -74,7 +74,7 @@ jobs:
7474
- name: Zipalign APK
7575
if: github.event_name == 'push'
7676
run: |
77-
"$ANDROID_SDK_ROOT/build-tools/35.0.0/zipalign" -v 4 "android/app/build/outputs/apk/release/app-release-unsigned.apk" "android/app/build/outputs/apk/release/app-release-aligned.apk"
77+
"$ANDROID_SDK_ROOT/build-tools/36.0.0/zipalign" -v 4 "android/app/build/outputs/apk/release/app-release-unsigned.apk" "android/app/build/outputs/apk/release/app-release-aligned.apk"
7878
- name: Decode and Save Keystore File
7979
if: github.event_name == 'push'
8080
run: |
@@ -86,7 +86,7 @@ jobs:
8686
if: github.event_name == 'push'
8787
run: |
8888
jarsigner -verbose -keystore "android/release.jks" -storepass "${{ secrets.KEYSTORE_PASSWORD }}" -keypass "${{ secrets.KEYSTORE_PASSWORD }}" -signedjar "android/app/build/outputs/bundle/release/app-release-signed.aab" "android/app/build/outputs/bundle/release/app-release.aab" "${{ secrets.KEY_ALIAS }}"
89-
"$ANDROID_SDK_ROOT/build-tools/35.0.0/apksigner" sign --ks "android/release.jks" --ks-pass "pass:${{ secrets.KEYSTORE_PASSWORD }}" --key-pass "pass:${{ secrets.KEYSTORE_PASSWORD }}" --ks-key-alias "${{ secrets.KEY_ALIAS }}" "android/app/build/outputs/apk/release/app-release-aligned.apk"
89+
"$ANDROID_SDK_ROOT/build-tools/36.0.0/apksigner" sign --ks "android/release.jks" --ks-pass "pass:${{ secrets.KEYSTORE_PASSWORD }}" --key-pass "pass:${{ secrets.KEYSTORE_PASSWORD }}" --ks-key-alias "${{ secrets.KEY_ALIAS }}" "android/app/build/outputs/apk/release/app-release-aligned.apk"
9090
- name: Upload Android AAB build artifacts
9191
if: github.event_name == 'push'
9292
uses: actions/upload-artifact@v4

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ jobs:
4444
run: yarn cap sync android
4545
- name: Accept SDK licenses
4646
run: yes | "$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager" --licenses
47-
# Capacitor v7 sets a deployment target of Android 15 (SDK 35)
47+
# Capacitor v8 targets SDK 36
4848
- name: Install SDK components
4949
run: |
50-
"$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager" "platform-tools" "platforms;android-35" "build-tools;35.0.0"
50+
"$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager" "platform-tools" "platforms;android-36" "build-tools;36.0.0"
5151
- name: Build Android ROSE Wallet
5252
run: ./gradlew bundleRelease
5353
working-directory: android

‎android/app/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ apply plugin: 'com.android.application'
33
def versionCodeOverride = project.hasProperty('versionCodeOverride') ? project.property('versionCodeOverride').toInteger() : 204004226
44

55
android {
6-
namespace "net.oasis.wallet"
7-
compileSdk rootProject.ext.compileSdkVersion
6+
namespace = "net.oasis.wallet"
7+
compileSdk = rootProject.ext.compileSdkVersion
88
defaultConfig {
99
applicationId "net.oasis.wallet"
1010
minSdkVersion rootProject.ext.minSdkVersion
@@ -15,7 +15,7 @@ android {
1515
aaptOptions {
1616
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
1717
// Default: https://android.googlesource.com/platform/frameworks/base/+/282e181b58cf72b6ca770dc7ca5f91f135444502/tools/aapt/AaptAssets.cpp#61
18-
ignoreAssetsPattern '!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~'
18+
ignoreAssetsPattern = '!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~'
1919
}
2020
}
2121
buildTypes {

‎android/app/capacitor.build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
1111
dependencies {
1212
implementation project(':capacitor-community-bluetooth-le')
1313
implementation project(':capacitor-app')
14-
implementation project(':capacitor-keyboard')
1514
implementation project(':capacitor-privacy-screen')
1615
implementation project(':capacitor-status-bar')
1716
implementation project(':capawesome-capacitor-android-edge-to-edge-support')

‎android/app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
android:supportsRtl="true"
99
android:theme="@style/AppTheme">
1010
<activity
11-
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode|navigation"
11+
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode|navigation|density"
1212
android:name=".MainActivity"
1313
android:label="@string/title_activity_main"
1414
android:theme="@style/AppTheme.NoActionBarLaunch"

‎android/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ buildscript {
77
mavenCentral()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:8.7.2'
11-
classpath 'com.google.gms:google-services:4.4.2'
10+
classpath 'com.android.tools.build:gradle:8.13.0'
11+
classpath 'com.google.gms:google-services:4.4.4'
1212

1313
// NOTE: Do not place your application dependencies here; they belong
1414
// in the individual module build.gradle files

‎android/capacitor.settings.gradle‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ project(':capacitor-community-bluetooth-le').projectDir = new File('../node_modu
88
include ':capacitor-app'
99
project(':capacitor-app').projectDir = new File('../node_modules/@capacitor/app/android')
1010

11-
include ':capacitor-keyboard'
12-
project(':capacitor-keyboard').projectDir = new File('../node_modules/@capacitor/keyboard/android')
13-
1411
include ':capacitor-privacy-screen'
1512
project(':capacitor-privacy-screen').projectDir = new File('../node_modules/@capacitor/privacy-screen/android')
1613

‎android/gradle/wrapper/gradle-wrapper.jar‎

181 Bytes
Binary file not shown.

‎android/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)