Merge pull request #58 from robinpowered/feature/update-ios

Feature/update ios
robinpowered · Oct 26, 2023 · 7971338 · 7971338
2 parents b115892 + 25f66f4
commit 7971338
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -130,6 +130,7 @@ DerivedData
 *.ipa
 *.xcuserstate
 project.xcworkspace
+ios/build
 
 ################
 # JetBrains

diff --git a/ios/AppConfigSettingsFramework copy-Info.plist b/ios/AppConfigSettingsFramework copy-Info.plist
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>
diff --git a/ios/AppConfigSettingsFramework.xcodeproj/project.pbxproj b/ios/AppConfigSettingsFramework.xcodeproj/project.pbxproj
@@ -14,6 +14,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		550EB9DA2AEABC48004FACF3 /* AppConfigSettingsFramework copy-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "AppConfigSettingsFramework copy-Info.plist"; path = "/Users/derekwheeler/code/react-native-mdm/ios/AppConfigSettingsFramework copy-Info.plist"; sourceTree = "<absolute>"; };
 		C91CCA6F1C691C0700E71355 /* AppConfigSettingsFramework.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = AppConfigSettingsFramework.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		C91CCA721C691C0700E71355 /* AppConfigSettingsFramework.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppConfigSettingsFramework.h; sourceTree = "<group>"; };
 		C91CCA741C691C0700E71355 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -168,6 +169,7 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_FRAMEWORK_INCLUDE_PRIVATE_FROM_PUBLIC = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
@@ -186,6 +188,7 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				EXCLUDED_ARCHS = arm64;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -200,6 +203,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = "/AppConfigSettingsFramework/**";
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -228,6 +232,7 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_FRAMEWORK_INCLUDE_PRIVATE_FROM_PUBLIC = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
@@ -246,6 +251,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				EXCLUDED_ARCHS = arm64;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -254,6 +260,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = "/AppConfigSettingsFramework/**";
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;

diff --git a/ios/AppConfigSettingsFramework/AppConfigSettingsFramework.h b/ios/AppConfigSettingsFramework/AppConfigSettingsFramework.h
@@ -15,4 +15,4 @@ FOUNDATION_EXPORT double AppConfigSettingsFrameworkVersionNumber;
 FOUNDATION_EXPORT const unsigned char AppConfigSettingsFrameworkVersionString[];
 
 // In this header, you should import all the public headers of your framework using statements like #import <AppConfigSettingsFramework/PublicHeader.h>
-#import "ManagedAppConfigKeys.h"
+#import <AppConfigSettingsFramework/ManagedAppConfigKeys.h>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-mdm",
-  "version": "2.0.1",
+  "version": "2.2.0",
   "description": "A mobile device management (MDM) module for react-native",
   "main": "index.js",
   "scripts": {

diff --git a/react-native-mdm.podspec b/react-native-mdm.podspec
@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.license      = package['license']
   s.authors      = package['author']
   s.homepage     = "https://github.com/robinpowered/react-native-mdm"
-  s.platforms    = { :ios => "9.0", :osx => "10.14" }
+  s.platforms    = { :ios => "12.0", :osx => "10.14" }
   s.source       = { :git => "https://github.com/robinpowered/react-native-mdm.git", :tag => "v#{s.version}" }
   s.source_files  = "ios/**/*.{h,m}"
   s.dependency 'React'