From 9ae1ddac0d6592623bbb84fea70cb899e30ec685 Mon Sep 17 00:00:00 2001 From: olcxja Date: Sun, 10 May 2026 17:09:15 +0200 Subject: [PATCH] Android build fix --- android/.gitignore | 3 +- .../build.gradle | 59 +++++++++++++++++++ .../cordova.variables.gradle | 7 +++ .../src/main/AndroidManifest.xml | 8 +++ .../src/main/java/.gitkeep | 0 .../src/main/res/.gitkeep | 1 + sync-project.sh | 4 +- 7 files changed, 79 insertions(+), 3 deletions(-) create mode 100644 android/capacitor-cordova-android-plugins/build.gradle create mode 100644 android/capacitor-cordova-android-plugins/cordova.variables.gradle create mode 100644 android/capacitor-cordova-android-plugins/src/main/AndroidManifest.xml create mode 100644 android/capacitor-cordova-android-plugins/src/main/java/.gitkeep create mode 100644 android/capacitor-cordova-android-plugins/src/main/res/.gitkeep diff --git a/android/.gitignore b/android/.gitignore index 48354a3d..34acf79f 100644 --- a/android/.gitignore +++ b/android/.gitignore @@ -90,7 +90,8 @@ lint/tmp/ *.hprof # Cordova plugins for Capacitor -capacitor-cordova-android-plugins +#capacitor-cordova-android-plugins +#need this for actions # Copied web assets app/src/main/assets/public diff --git a/android/capacitor-cordova-android-plugins/build.gradle b/android/capacitor-cordova-android-plugins/build.gradle new file mode 100644 index 00000000..b2e25ddd --- /dev/null +++ b/android/capacitor-cordova-android-plugins/build.gradle @@ -0,0 +1,59 @@ +ext { + androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.7.1' + cordovaAndroidVersion = project.hasProperty('cordovaAndroidVersion') ? rootProject.ext.cordovaAndroidVersion : '14.0.1' +} + +buildscript { + repositories { + google() + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:8.13.0' + } +} + +apply plugin: 'com.android.library' + +android { + namespace = "capacitor.cordova.android.plugins" + compileSdk = project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 36 + defaultConfig { + minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 24 + targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 36 + versionCode 1 + versionName "1.0" + } + lintOptions { + abortOnError = false + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_21 + targetCompatibility JavaVersion.VERSION_21 + } +} + +repositories { + google() + mavenCentral() + flatDir{ + dirs 'src/main/libs', 'libs' + } +} + +dependencies { + implementation fileTree(dir: 'src/main/libs', include: ['*.jar']) + implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion" + implementation "org.apache.cordova:framework:$cordovaAndroidVersion" + // SUB-PROJECT DEPENDENCIES START + + // SUB-PROJECT DEPENDENCIES END +} + +// PLUGIN GRADLE EXTENSIONS START +apply from: "cordova.variables.gradle" +// PLUGIN GRADLE EXTENSIONS END + +for (def func : cdvPluginPostBuildExtras) { + func() +} \ No newline at end of file diff --git a/android/capacitor-cordova-android-plugins/cordova.variables.gradle b/android/capacitor-cordova-android-plugins/cordova.variables.gradle new file mode 100644 index 00000000..b806d8ad --- /dev/null +++ b/android/capacitor-cordova-android-plugins/cordova.variables.gradle @@ -0,0 +1,7 @@ +// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN +ext { + cdvMinSdkVersion = project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 24 + // Plugin gradle extensions can append to this to have code run at the end. + cdvPluginPostBuildExtras = [] + cordovaConfig = [:] +} \ No newline at end of file diff --git a/android/capacitor-cordova-android-plugins/src/main/AndroidManifest.xml b/android/capacitor-cordova-android-plugins/src/main/AndroidManifest.xml new file mode 100644 index 00000000..cb9c8aa3 --- /dev/null +++ b/android/capacitor-cordova-android-plugins/src/main/AndroidManifest.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/android/capacitor-cordova-android-plugins/src/main/java/.gitkeep b/android/capacitor-cordova-android-plugins/src/main/java/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/android/capacitor-cordova-android-plugins/src/main/res/.gitkeep b/android/capacitor-cordova-android-plugins/src/main/res/.gitkeep new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/android/capacitor-cordova-android-plugins/src/main/res/.gitkeep @@ -0,0 +1 @@ + diff --git a/sync-project.sh b/sync-project.sh index 98db924e..d14c0657 100755 --- a/sync-project.sh +++ b/sync-project.sh @@ -7,10 +7,10 @@ npx cap copy npx cap copy electron #platform specifics -npx capacitor-assets generate --android - npx capacitor-assets generate --pwa +npx capacitor-assets generate --android + magick -background none -density 300 -define icon:auto-resize=256,128,64,48,32,16 ./assets/icon.svg ./icons/icon.ico cp ./icons/icon.ico ./electron/assets/icon.ico