From 5ca477e3fb53129803fffb631d5465206fccc1c4 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Thu, 13 Feb 2025 19:26:18 +0100 Subject: [PATCH] Attempt to fix fdroid build --- .gitignore | 2 - .../build.gradle | 59 +++++++++++++++++++ .../cordova.variables.gradle | 7 +++ .../src/main/AndroidManifest.xml | 8 +++ .../src/main/java/.gitkeep | 0 .../src/main/res/.gitkeep | 1 + 6 files changed, 75 insertions(+), 2 deletions(-) create mode 100644 capacitor-cordova-android-plugins/build.gradle create mode 100644 capacitor-cordova-android-plugins/cordova.variables.gradle create mode 100644 capacitor-cordova-android-plugins/src/main/AndroidManifest.xml create mode 100644 capacitor-cordova-android-plugins/src/main/java/.gitkeep create mode 100644 capacitor-cordova-android-plugins/src/main/res/.gitkeep diff --git a/.gitignore b/.gitignore index 157ab202..261c9a29 100644 --- a/.gitignore +++ b/.gitignore @@ -89,8 +89,6 @@ lint/tmp/ # Android Profiling *.hprof -# Cordova plugins for Capacitor -capacitor-cordova-android-plugins # Copied web assets app/src/main/assets/public diff --git a/capacitor-cordova-android-plugins/build.gradle b/capacitor-cordova-android-plugins/build.gradle new file mode 100644 index 00000000..2d9d0f21 --- /dev/null +++ b/capacitor-cordova-android-plugins/build.gradle @@ -0,0 +1,59 @@ +ext { + androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.6.1' + cordovaAndroidVersion = project.hasProperty('cordovaAndroidVersion') ? rootProject.ext.cordovaAndroidVersion : '10.1.1' +} + +buildscript { + repositories { + google() + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:8.2.1' + } +} + +apply plugin: 'com.android.library' + +android { + namespace "capacitor.cordova.android.plugins" + compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 34 + defaultConfig { + minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22 + targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 34 + versionCode 1 + versionName "1.0" + } + lintOptions { + abortOnError false + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } +} + +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/capacitor-cordova-android-plugins/cordova.variables.gradle b/capacitor-cordova-android-plugins/cordova.variables.gradle new file mode 100644 index 00000000..5b55884e --- /dev/null +++ b/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 : 22 + // 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/capacitor-cordova-android-plugins/src/main/AndroidManifest.xml b/capacitor-cordova-android-plugins/src/main/AndroidManifest.xml new file mode 100644 index 00000000..cb9c8aa3 --- /dev/null +++ b/capacitor-cordova-android-plugins/src/main/AndroidManifest.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/capacitor-cordova-android-plugins/src/main/java/.gitkeep b/capacitor-cordova-android-plugins/src/main/java/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/capacitor-cordova-android-plugins/src/main/res/.gitkeep b/capacitor-cordova-android-plugins/src/main/res/.gitkeep new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/capacitor-cordova-android-plugins/src/main/res/.gitkeep @@ -0,0 +1 @@ +