Skip to content

Commit 65fca98

Browse files
committed
Capacitor 8
1 parent 1aa9e2b commit 65fca98

File tree

71 files changed

+276
-267
lines changed

Some content is hidden

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

71 files changed

+276
-267
lines changed

.ncurc.json

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
11
{
2-
"reject": ["@ai-sdk/angular", "ai"]
2+
"reject": [
3+
"@ai-sdk/angular",
4+
"ai",
5+
"@capacitor/android",
6+
"@capacitor/app",
7+
"@capacitor/browser",
8+
"@capacitor/camera",
9+
"@capacitor/core",
10+
"@capacitor/device",
11+
"@capacitor/filesystem",
12+
"@capacitor/ios",
13+
"@capacitor/splash-screen",
14+
"@capacitor/status-bar",
15+
"@capacitor/cli"
16+
]
317
}

android/.gitignore

Lines changed: 85 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,101 @@
1-
#
2-
.idea
3-
.gradle
4-
build
1+
# Using Android gitignore template: https://github.com/github/gitignore/blob/HEAD/Android.gitignore
52

3+
# Built application files
64
*.apk
75
*.aar
86
*.ap_
97
*.aab
8+
9+
# Files for the ART/Dalvik VM
10+
*.dex
11+
12+
# Java class files
13+
*.class
14+
15+
# Generated files
16+
bin/
17+
gen/
18+
out/
19+
# Uncomment the following line in case you need and you don't have the release build type files in your app
20+
# release/
21+
22+
# Gradle files
23+
.gradle/
24+
build/
25+
26+
# Local configuration file (sdk path, etc)
27+
local.properties
28+
29+
# Proguard folder generated by Eclipse
30+
proguard/
31+
32+
# Log Files
1033
*.log
34+
35+
# Android Studio Navigation editor temp files
36+
.navigation/
37+
38+
# Android Studio captures folder
39+
captures/
40+
41+
# IntelliJ
1142
*.iml
43+
.idea/workspace.xml
44+
.idea/tasks.xml
45+
.idea/gradle.xml
46+
.idea/assetWizardSettings.xml
47+
.idea/dictionaries
48+
.idea/libraries
49+
# Android Studio 3 in .gitignore file.
50+
.idea/caches
51+
.idea/modules.xml
52+
# Comment next line if keeping position of elements in Navigation Editor is relevant for you
53+
.idea/navEditor.xml
1254

13-
# Local Properties
14-
local.properties
55+
# Keystore files
56+
# Uncomment the following lines if you do not want to check your keystore files in.
57+
#*.jks
58+
#*.keystore
59+
60+
# External native build folder generated in Android Studio 2.2 and later
61+
.externalNativeBuild
62+
.cxx/
63+
64+
# Google Services (e.g. APIs or Firebase)
65+
# google-services.json
66+
67+
# Freeline
68+
freeline.py
69+
freeline/
70+
freeline_project_description.json
71+
72+
# fastlane
73+
fastlane/report.xml
74+
fastlane/Preview.html
75+
fastlane/screenshots
76+
fastlane/test_output
77+
fastlane/readme.md
78+
79+
# Version control
80+
vcs.xml
81+
82+
# lint
83+
lint/intermediates/
84+
lint/generated/
85+
lint/outputs/
86+
lint/tmp/
87+
# lint/reports/
88+
89+
# Android Profiling
90+
*.hprof
1591

1692
# Cordova plugins for Capacitor
1793
capacitor-cordova-android-plugins
1894

19-
# Capacitor Web Assets
95+
# Copied web assets
2096
app/src/main/assets/public
97+
98+
# Generated Config files
2199
app/src/main/assets/capacitor.config.json
22100
app/src/main/assets/capacitor.plugins.json
23101
app/src/main/res/xml/config.xml

android/app/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ android {
1111
versionName "1.0"
1212
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1313
aaptOptions {
14-
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
15-
// Default: https://android.googlesource.com/platform/frameworks/base/+/282e181b58cf72b6ca770dc7ca5f91f135444502/tools/aapt/AaptAssets.cpp#61
14+
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
15+
// Default: https://android.googlesource.com/platform/frameworks/base/+/282e181b58cf72b6ca770dc7ca5f91f135444502/tools/aapt/AaptAssets.cpp#61
1616
ignoreAssetsPattern '!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~'
1717
}
1818
}
@@ -25,7 +25,7 @@ android {
2525
}
2626

2727
repositories {
28-
flatDir {
28+
flatDir{
2929
dirs '../capacitor-cordova-android-plugins/src/main/libs', 'libs'
3030
}
3131
}
@@ -49,6 +49,6 @@ try {
4949
if (servicesJSON.text) {
5050
apply plugin: 'com.google.gms.google-services'
5151
}
52-
} catch (Exception e) {
53-
logger.error("google-services.json not found, google-services plugin not applied. Push Notifications won't work", e)
52+
} catch(Exception e) {
53+
logger.info("google-services.json not found, google-services plugin not applied. Push Notifications won't work")
5454
}

android/app/capacitor.build.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,10 @@ android {
1010
apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
1111
dependencies {
1212
implementation project(':capacitor-app')
13-
implementation project(':capacitor-barcode-scanner')
1413
implementation project(':capacitor-browser')
1514
implementation project(':capacitor-camera')
1615
implementation project(':capacitor-device')
1716
implementation project(':capacitor-filesystem')
18-
implementation project(':capacitor-haptics')
19-
implementation project(':capacitor-inappbrowser')
20-
implementation project(':capacitor-keyboard')
2117
implementation project(':capacitor-splash-screen')
2218
implementation project(':capacitor-status-bar')
2319

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
2-
<manifest xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
33
<application
44
android:allowBackup="true"
55
android:icon="@mipmap/ic_launcher"
@@ -8,15 +8,15 @@
88
android:supportsRtl="true"
99
android:theme="@style/AppTheme">
1010
<activity
11-
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
11+
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode|navigation"
1212
android:name=".MainActivity"
1313
android:label="@string/title_activity_main"
1414
android:theme="@style/AppTheme.NoActionBarLaunch"
1515
android:launchMode="singleTask"
1616
android:exported="true">
1717
<intent-filter>
18-
<action android:name="android.intent.action.MAIN" />
19-
<category android:name="android.intent.category.LAUNCHER" />
18+
<action android:name="android.intent.action.MAIN"/>
19+
<category android:name="android.intent.category.LAUNCHER"/>
2020
</intent-filter>
2121
</activity>
2222

@@ -25,10 +25,10 @@
2525
android:authorities="${applicationId}.fileprovider"
2626
android:exported="false"
2727
android:grantUriPermissions="true">
28-
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" />
28+
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
2929
</provider>
3030
</application>
3131

3232
<!-- Permissions -->
33-
<uses-permission android:name="android.permission.INTERNET" tools:ignore="ManifestOrder" />
33+
<uses-permission android:name="android.permission.INTERNET"/>
3434
</manifest>
-95.1 KB
-42.5 KB
Binary file not shown.
-57.2 KB
-32.3 KB
Binary file not shown.
-8.43 KB
Binary file not shown.

0 commit comments

Comments
 (0)