Skip to content

Commit daf9a69

Browse files
chore: upgrade Capacitor dependencies to version 7.0.0 (#579)
* chore: upgrade Capacitor dependencies to version 7.0.0 refactor: remove backup-related components and logic - Deleted backup-builder.ts, backup-drawer.ts, backup-entity.ts, backups.ts, load-backup-dialog.ts, restore-backup-dialog.ts, and their corresponding HTML files. - Removed backup functionality from local-storage-service.ts and user-page.ts. - Cleaned up user-router.ts to remove references to backups. feat: add changelog for Android target API level update * fix: update Node.js version to 22.x and Java version to 21 in CI workflows
1 parent 5bb9fa0 commit daf9a69

35 files changed

+2941
-2205
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ jobs:
1010

1111
steps:
1212
- uses: actions/checkout@v4
13-
13+
1414
- name: Validate Fastlane
1515
uses: ashutoshgngwr/validate-fastlane-supply-metadata@v2
1616
with:
1717
usePlayStoreLocales: true
18-
18+
1919
- name: Setup Node.js
2020
uses: actions/setup-node@v4
2121
with:
22-
node-version: 20.x
22+
node-version: 22.x
2323

2424
- name: Install app dependencies
2525
run: npm ci

.github/workflows/fastlane-internal.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ jobs:
2020
uses: actions/setup-java@v4
2121
with:
2222
distribution: 'zulu'
23-
java-version: '17'
23+
java-version: '21'
2424

2525
- name: Setup Node.js
2626
uses: actions/setup-node@v4
2727
with:
28-
node-version: 20.x
28+
node-version: 22.x
2929

3030
- name: Install app dependencies
3131
run: npm ci

.github/workflows/stale.yml

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,21 @@
66
name: Mark stale issues and pull requests
77

88
on:
9-
schedule:
10-
- cron: '29 5 * * *'
9+
schedule:
10+
- cron: '29 5 * * *'
1111

1212
jobs:
13-
stale:
13+
stale:
14+
runs-on: ubuntu-latest
15+
permissions:
16+
issues: write
17+
pull-requests: write
1418

15-
runs-on: ubuntu-latest
16-
permissions:
17-
issues: write
18-
pull-requests: write
19-
20-
steps:
21-
- uses: actions/stale@v5
22-
with:
23-
repo-token: ${{ secrets.GITHUB_TOKEN }}
24-
stale-issue-message: 'Stale issue message'
25-
stale-pr-message: 'Stale pull request message'
26-
stale-issue-label: 'no-issue-activity'
27-
stale-pr-label: 'no-pr-activity'
19+
steps:
20+
- uses: actions/stale@v5
21+
with:
22+
repo-token: ${{ secrets.GITHUB_TOKEN }}
23+
stale-issue-message: 'Stale issue message'
24+
stale-pr-message: 'Stale pull request message'
25+
stale-issue-label: 'no-issue-activity'
26+
stale-pr-label: 'no-pr-activity'

android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ android {
77
applicationId "com.moimob.drinkable"
88
minSdkVersion rootProject.ext.minSdkVersion
99
targetSdkVersion rootProject.ext.targetSdkVersion
10-
versionCode 15600
11-
versionName "1.56.0"
10+
versionCode 15700
11+
versionName "1.57.0"
1212
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1313
aaptOptions {
1414
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

android/app/capacitor.build.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,15 @@
22

33
android {
44
compileOptions {
5-
sourceCompatibility JavaVersion.VERSION_17
6-
targetCompatibility JavaVersion.VERSION_17
5+
sourceCompatibility JavaVersion.VERSION_21
6+
targetCompatibility JavaVersion.VERSION_21
77
}
88
}
99

1010
apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
1111
dependencies {
1212
implementation project(':capacitor-app')
1313
implementation project(':capacitor-clipboard')
14-
implementation project(':capacitor-filesystem')
1514
implementation project(':capacitor-preferences')
1615

1716
}

android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
android:supportsRtl="true"
1010
android:theme="@style/AppTheme">
1111
<activity
12-
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
12+
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode|navigation"
1313
android:name="com.moimob.drinkable.MainActivity"
1414
android:exported="true"
1515
android:label="@string/title_activity_main"

android/app/src/main/assets/capacitor.config.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
"appId": "com.moimob.drinkable",
33
"appName": "Drinkable",
44
"webDir": "dist",
5-
"bundledWebRuntime": false,
65
"backgroundColor": "#161314"
76
}

android/app/src/main/assets/capacitor.plugins.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@
77
"pkg": "@capacitor/clipboard",
88
"classpath": "com.capacitorjs.plugins.clipboard.ClipboardPlugin"
99
},
10-
{
11-
"pkg": "@capacitor/filesystem",
12-
"classpath": "com.capacitorjs.plugins.filesystem.FilesystemPlugin"
13-
},
1410
{
1511
"pkg": "@capacitor/preferences",
1612
"classpath": "com.capacitorjs.plugins.preferences.PreferencesPlugin"

android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ buildscript {
66
mavenCentral()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:8.2.1'
10-
classpath 'com.google.gms:google-services:4.4.0'
9+
classpath 'com.android.tools.build:gradle:8.11.0'
10+
classpath 'com.google.gms:google-services:4.4.2'
1111
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20"
1212

1313
// NOTE: Do not place your application dependencies here; they belong

android/capacitor.settings.gradle

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

11-
include ':capacitor-filesystem'
12-
project(':capacitor-filesystem').projectDir = new File('../node_modules/@capacitor/filesystem/android')
13-
1411
include ':capacitor-preferences'
1512
project(':capacitor-preferences').projectDir = new File('../node_modules/@capacitor/preferences/android')

0 commit comments

Comments
 (0)