Skip to content

Commit bfcd9f2

Browse files
committed
Merge branch 'update-capacitor' into dev
2 parents df9272f + 07b377b commit bfcd9f2

File tree

123 files changed

+394
-208
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+394
-208
lines changed

apps/client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
},
9999
"devDependencies": {
100100
"@intlify/vite-plugin-vue-i18n": "^3.4.0",
101-
"@quasar/app-vite": "npm:@deepnotes/quasar-app-vite@^2.0.0-alpha.41",
101+
"@quasar/app-vite": "npm:@deepnotes/quasar-app-vite@^2.0.0-alpha.42",
102102
"@types/argon2-browser": "^1.18.3",
103103
"@types/color": "^3.0.5",
104104
"@types/cookie": "^0.5.3",
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/**/capacitor.config.json
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
/build/*
2-
!/build/.npmkeep
2+
!/build/.npmkeep

apps/client/src-capacitor/android/app/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ android {
2121
storePassword keyStoreProperties['releaseStorePassword']
2222
}
2323
}
24-
24+
25+
namespace "app.deepnotes"
2526
compileSdkVersion rootProject.ext.compileSdkVersion
26-
2727
defaultConfig {
2828
applicationId "app.deepnotes"
2929
minSdkVersion rootProject.ext.minSdkVersion
@@ -39,8 +39,8 @@ android {
3939
}
4040
buildTypes {
4141
release {
42-
signingConfig signingConfigs.release
43-
minifyEnabled true
42+
signingConfig signingConfigs.release
43+
minifyEnabled false
4444
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
4545
}
4646
}

apps/client/src-capacitor/android/app/capacitor.build.gradle

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

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

apps/client/src-capacitor/android/app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="app.deepnotes">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
43

54
<application
65
android:usesCleartextTraffic="true"
@@ -13,7 +12,7 @@
1312

1413
<activity
1514
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
16-
android:name="app.deepnotes.MainActivity"
15+
android:name=".MainActivity"
1716
android:label="@string/title_activity_main"
1817
android:theme="@style/AppTheme.NoActionBarLaunch"
1918
android:launchMode="singleTask"

apps/client/src-capacitor/android/app/src/main/assets/capacitor.config.json

Lines changed: 0 additions & 21 deletions
This file was deleted.
5.78 KB
2.75 KB
6.15 KB

0 commit comments

Comments
 (0)