Skip to content

Commit 7971338

Browse files
authored
Merge pull request #58 from robinpowered/feature/update-ios
Feature/update ios
2 parents b115892 + 25f66f4 commit 7971338

6 files changed

Lines changed: 37 additions & 3 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ DerivedData
130130
*.ipa
131131
*.xcuserstate
132132
project.xcworkspace
133+
ios/build
133134

134135
################
135136
# JetBrains
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>en</string>
7+
<key>CFBundleExecutable</key>
8+
<string>$(EXECUTABLE_NAME)</string>
9+
<key>CFBundleIdentifier</key>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
11+
<key>CFBundleInfoDictionaryVersion</key>
12+
<string>6.0</string>
13+
<key>CFBundleName</key>
14+
<string>$(PRODUCT_NAME)</string>
15+
<key>CFBundlePackageType</key>
16+
<string>FMWK</string>
17+
<key>CFBundleShortVersionString</key>
18+
<string>1.0</string>
19+
<key>CFBundleSignature</key>
20+
<string>????</string>
21+
<key>CFBundleVersion</key>
22+
<string>$(CURRENT_PROJECT_VERSION)</string>
23+
<key>NSPrincipalClass</key>
24+
<string></string>
25+
</dict>
26+
</plist>

ios/AppConfigSettingsFramework.xcodeproj/project.pbxproj

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
/* End PBXBuildFile section */
1515

1616
/* Begin PBXFileReference section */
17+
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>"; };
1718
C91CCA6F1C691C0700E71355 /* AppConfigSettingsFramework.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = AppConfigSettingsFramework.framework; sourceTree = BUILT_PRODUCTS_DIR; };
1819
C91CCA721C691C0700E71355 /* AppConfigSettingsFramework.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppConfigSettingsFramework.h; sourceTree = "<group>"; };
1920
C91CCA741C691C0700E71355 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -168,6 +169,7 @@
168169
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
169170
CLANG_WARN_EMPTY_BODY = YES;
170171
CLANG_WARN_ENUM_CONVERSION = YES;
172+
CLANG_WARN_FRAMEWORK_INCLUDE_PRIVATE_FROM_PUBLIC = YES;
171173
CLANG_WARN_INFINITE_RECURSION = YES;
172174
CLANG_WARN_INT_CONVERSION = YES;
173175
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
@@ -186,6 +188,7 @@
186188
DEBUG_INFORMATION_FORMAT = dwarf;
187189
ENABLE_STRICT_OBJC_MSGSEND = YES;
188190
ENABLE_TESTABILITY = YES;
191+
EXCLUDED_ARCHS = arm64;
189192
GCC_C_LANGUAGE_STANDARD = gnu99;
190193
GCC_DYNAMIC_NO_PIC = NO;
191194
GCC_NO_COMMON_BLOCKS = YES;
@@ -200,6 +203,7 @@
200203
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
201204
GCC_WARN_UNUSED_FUNCTION = YES;
202205
GCC_WARN_UNUSED_VARIABLE = YES;
206+
HEADER_SEARCH_PATHS = "/AppConfigSettingsFramework/**";
203207
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
204208
MTL_ENABLE_DEBUG_INFO = YES;
205209
ONLY_ACTIVE_ARCH = YES;
@@ -228,6 +232,7 @@
228232
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
229233
CLANG_WARN_EMPTY_BODY = YES;
230234
CLANG_WARN_ENUM_CONVERSION = YES;
235+
CLANG_WARN_FRAMEWORK_INCLUDE_PRIVATE_FROM_PUBLIC = YES;
231236
CLANG_WARN_INFINITE_RECURSION = YES;
232237
CLANG_WARN_INT_CONVERSION = YES;
233238
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
@@ -246,6 +251,7 @@
246251
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
247252
ENABLE_NS_ASSERTIONS = NO;
248253
ENABLE_STRICT_OBJC_MSGSEND = YES;
254+
EXCLUDED_ARCHS = arm64;
249255
GCC_C_LANGUAGE_STANDARD = gnu99;
250256
GCC_NO_COMMON_BLOCKS = YES;
251257
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -254,6 +260,7 @@
254260
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
255261
GCC_WARN_UNUSED_FUNCTION = YES;
256262
GCC_WARN_UNUSED_VARIABLE = YES;
263+
HEADER_SEARCH_PATHS = "/AppConfigSettingsFramework/**";
257264
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
258265
MTL_ENABLE_DEBUG_INFO = NO;
259266
SDKROOT = iphoneos;

ios/AppConfigSettingsFramework/AppConfigSettingsFramework.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ FOUNDATION_EXPORT double AppConfigSettingsFrameworkVersionNumber;
1515
FOUNDATION_EXPORT const unsigned char AppConfigSettingsFrameworkVersionString[];
1616

1717
// In this header, you should import all the public headers of your framework using statements like #import <AppConfigSettingsFramework/PublicHeader.h>
18-
#import "ManagedAppConfigKeys.h"
18+
#import <AppConfigSettingsFramework/ManagedAppConfigKeys.h>

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-native-mdm",
3-
"version": "2.0.1",
3+
"version": "2.2.0",
44
"description": "A mobile device management (MDM) module for react-native",
55
"main": "index.js",
66
"scripts": {

react-native-mdm.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
1010
s.license = package['license']
1111
s.authors = package['author']
1212
s.homepage = "https://github.com/robinpowered/react-native-mdm"
13-
s.platforms = { :ios => "9.0", :osx => "10.14" }
13+
s.platforms = { :ios => "12.0", :osx => "10.14" }
1414
s.source = { :git => "https://github.com/robinpowered/react-native-mdm.git", :tag => "v#{s.version}" }
1515
s.source_files = "ios/**/*.{h,m}"
1616
s.dependency 'React'

0 commit comments

Comments
 (0)