From 9607725df6e8687c56bb5f41cd3cf4b349223c78 Mon Sep 17 00:00:00 2001 From: Alexey Gulev Date: Sun, 23 May 2021 11:14:47 +0200 Subject: [PATCH] Issue with build process because of appcompat 1.4 alpha (#19) * New AndroidManifest.xml for the merging tool * Fixed conflict with other NE that uses FileProvider * Replaced FileProvider with SharingFileProvider * Fixed screenshot dependency version * Added GPS dependency * Updated for using AndroidX * fix issue with build error --- game.project | 6 +- generated.appmanifest | 101 --------------------------- share/manifests/android/build.gradle | 2 +- 3 files changed, 3 insertions(+), 106 deletions(-) delete mode 100644 generated.appmanifest diff --git a/game.project b/game.project index d6c5873..946155b 100644 --- a/game.project +++ b/game.project @@ -1,9 +1,10 @@ [project] title = Sharing version = 1.0.1 -dependencies = https://github.com/britzl/gooey/archive/8.1.1.zip,https://github.com/britzl/defold-screenshot/archive/1.7.4.zip write_log = 0 custom_resources = example/videos +dependencies#0 = https://github.com/britzl/gooey/archive/8.1.1.zip +dependencies#1 = https://github.com/britzl/defold-screenshot/archive/1.7.4.zip [bootstrap] main_collection = /example/example.collectionc @@ -33,6 +34,3 @@ bundle_identifier = com.britzl.defold.sharing [osx] bundle_identifier = com.britzl.defold.sharing -[native_extension] -app_manifest = /generated.appmanifest - diff --git a/generated.appmanifest b/generated.appmanifest deleted file mode 100644 index e36692b..0000000 --- a/generated.appmanifest +++ /dev/null @@ -1,101 +0,0 @@ -# App manifest generated Thu Dec 17 2020 16:31:58 GMT+0100 (CET) -# Settings: OpenGL -platforms: - x86_64-osx: - context: - excludeLibs: [] - excludeSymbols: [] - symbols: [] - libs: [] - frameworks: [] - linkFlags: [] - - x86_64-linux: - context: - excludeLibs: [] - excludeSymbols: [] - symbols: [] - libs: [] - linkFlags: [] - - js-web: - context: - excludeLibs: [] - excludeJsLibs: [] - excludeSymbols: [] - symbols: [] - libs: [] - linkFlags: [] - - wasm-web: - context: - excludeLibs: [] - excludeJsLibs: [] - excludeSymbols: [] - symbols: [] - libs: [] - linkFlags: [] - - x86-win32: - context: - excludeLibs: [] - excludeSymbols: [] - symbols: [] - libs: [] - linkFlags: [] - - x86_64-win32: - context: - excludeLibs: [] - excludeSymbols: [] - symbols: [] - libs: [] - linkFlags: [] - - armv7-android: - context: - excludeLibs: [] - excludeJars: [] - excludeSymbols: [] - symbols: [] - libs: [] - linkFlags: [] - jetifier: true - - arm64-android: - context: - excludeLibs: [] - excludeJars: [] - excludeSymbols: [] - symbols: [] - libs: [] - linkFlags: [] - jetifier: true - - armv7-ios: - context: - excludeLibs: [] - excludeSymbols: [] - symbols: [] - libs: [] - frameworks: [] - linkFlags: [] - - arm64-ios: - context: - excludeLibs: [] - excludeSymbols: [] - symbols: [] - libs: [] - frameworks: [] - linkFlags: [] - - x86_64-ios: - context: - excludeLibs: [] - excludeSymbols: [] - symbols: [] - libs: [] - frameworks: [] - linkFlags: [] - diff --git a/share/manifests/android/build.gradle b/share/manifests/android/build.gradle index 7dc2877..bd444ba 100644 --- a/share/manifests/android/build.gradle +++ b/share/manifests/android/build.gradle @@ -3,5 +3,5 @@ dependencies { compile 'com.google.android.gms:play-services-base:16.+' // https://developer.android.com/topic/libraries/support-library/packages - compile 'androidx.appcompat:appcompat:1.+' + compile 'androidx.appcompat:appcompat:1.3.0' }