Merge pull request #69 from MushroomObserver/enable-m1-build

Update packagingOptions and update to 1.0.48
MushroomObserver · Jul 15, 2023 · dc479b1 · dc479b1
2 parents 59227b5 + 2a4f55e
commit dc479b1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -144,8 +144,14 @@ android {
         applicationId "org.mushroomobserver.mobile"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 47
-        versionName "1.0.47"
+        versionCode 48
+        versionName "1.0.48"
+    }
+    packagingOptions {
+        pickFirst 'lib/x86/libc++_shared.so'
+        pickFirst 'lib/x86_64/libc++_shared.so'
+        pickFirst 'lib/armeabi-v7a/libc++_shared.so'
+        pickFirst 'lib/arm64-v8a/libc++_shared.so'
     }
     splits {
         abi {

diff --git a/ios/MushroomObserver.xcodeproj/project.pbxproj b/ios/MushroomObserver.xcodeproj/project.pbxproj
@@ -524,7 +524,7 @@
 				ALLOW_TARGET_PLATFORM_SPECIALIZATION = NO;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 47;
+				CURRENT_PROJECT_VERSION = 48;
 				DEVELOPMENT_TEAM = V7M8VK952M;
 				ENABLE_BITCODE = NO;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -533,7 +533,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.47;
+				MARKETING_VERSION = 1.0.48;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -555,15 +555,15 @@
 				ALLOW_TARGET_PLATFORM_SPECIALIZATION = NO;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 47;
+				CURRENT_PROJECT_VERSION = 48;
 				DEVELOPMENT_TEAM = V7M8VK952M;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				INFOPLIST_FILE = MushroomObserver/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.47;
+				MARKETING_VERSION = 1.0.48;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",