Skip to content

Commit 80a51e9

Browse files
committed
Update for Android 11 and iOS 14
1 parent c10103a commit 80a51e9

File tree

3 files changed

+33
-13
lines changed

3 files changed

+33
-13
lines changed

inspector/ios-inspector/ForgeModule/ForgeModule.xcodeproj/project.pbxproj

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
B3CC61F41716ECBB00A1A8EF /* oauth_EventListener.m in Sources */ = {isa = PBXBuildFile; fileRef = B3CC61F31716ECBB00A1A8EF /* oauth_EventListener.m */; };
1717
B3FC51F815C151E5003574D9 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B3FC51F715C151E5003574D9 /* UIKit.framework */; };
1818
B3FC51FF15C1523D003574D9 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B3FC51FE15C1523D003574D9 /* CoreGraphics.framework */; };
19-
B3FC524215C177EA003574D9 /* AssetsLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B3FC524115C177EA003574D9 /* AssetsLibrary.framework */; };
2019
B3FC524815C17B2C003574D9 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B3FC524715C17B2C003574D9 /* SystemConfiguration.framework */; };
2120
/* End PBXBuildFile section */
2221

@@ -47,7 +46,6 @@
4746
buildActionMask = 2147483647;
4847
files = (
4948
B3FC524815C17B2C003574D9 /* SystemConfiguration.framework in Frameworks */,
50-
B3FC524215C177EA003574D9 /* AssetsLibrary.framework in Frameworks */,
5149
B3FC51FF15C1523D003574D9 /* CoreGraphics.framework in Frameworks */,
5250
B3FC51F815C151E5003574D9 /* UIKit.framework in Frameworks */,
5351
B31B6D5215C13D5200854074 /* Foundation.framework in Frameworks */,
@@ -149,15 +147,16 @@
149147
B31B6D4515C13D5200854074 /* Project object */ = {
150148
isa = PBXProject;
151149
attributes = {
152-
LastUpgradeCheck = 0900;
150+
LastUpgradeCheck = 1200;
153151
ORGANIZATIONNAME = "Trigger Corp";
154152
};
155153
buildConfigurationList = B31B6D4815C13D5200854074 /* Build configuration list for PBXProject "ForgeModule" */;
156154
compatibilityVersion = "Xcode 3.2";
157-
developmentRegion = English;
155+
developmentRegion = en;
158156
hasScannedForEncodings = 0;
159157
knownRegions = (
160158
en,
159+
Base,
161160
);
162161
mainGroup = B31B6D4315C13D5200854074;
163162
productRefGroup = B31B6D4F15C13D5200854074 /* Products */;
@@ -204,19 +203,23 @@
204203
B31B6D5A15C13D5200854074 /* Debug */ = {
205204
isa = XCBuildConfiguration;
206205
buildSettings = {
207-
ALWAYS_SEARCH_USER_PATHS = YES;
206+
ALWAYS_SEARCH_USER_PATHS = NO;
207+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
208208
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
209209
CLANG_ENABLE_OBJC_ARC = YES;
210210
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
211211
CLANG_WARN_BOOL_CONVERSION = YES;
212212
CLANG_WARN_COMMA = YES;
213213
CLANG_WARN_CONSTANT_CONVERSION = YES;
214+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
214215
CLANG_WARN_EMPTY_BODY = YES;
215216
CLANG_WARN_ENUM_CONVERSION = YES;
216217
CLANG_WARN_INFINITE_RECURSION = YES;
217218
CLANG_WARN_INT_CONVERSION = YES;
218219
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
220+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
219221
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
222+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
220223
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
221224
CLANG_WARN_STRICT_PROTOTYPES = YES;
222225
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -243,7 +246,7 @@
243246
GCC_WARN_UNINITIALIZED_AUTOS = YES;
244247
GCC_WARN_UNUSED_FUNCTION = YES;
245248
GCC_WARN_UNUSED_VARIABLE = YES;
246-
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
249+
IPHONEOS_DEPLOYMENT_TARGET = 12.4;
247250
ONLY_ACTIVE_ARCH = YES;
248251
SDKROOT = iphoneos;
249252
VALID_ARCHS = "armv7 armv7s i386 arm64 x86_64";
@@ -253,19 +256,23 @@
253256
B31B6D5B15C13D5200854074 /* Release */ = {
254257
isa = XCBuildConfiguration;
255258
buildSettings = {
256-
ALWAYS_SEARCH_USER_PATHS = YES;
259+
ALWAYS_SEARCH_USER_PATHS = NO;
260+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
257261
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
258262
CLANG_ENABLE_OBJC_ARC = YES;
259263
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
260264
CLANG_WARN_BOOL_CONVERSION = YES;
261265
CLANG_WARN_COMMA = YES;
262266
CLANG_WARN_CONSTANT_CONVERSION = YES;
267+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
263268
CLANG_WARN_EMPTY_BODY = YES;
264269
CLANG_WARN_ENUM_CONVERSION = YES;
265270
CLANG_WARN_INFINITE_RECURSION = YES;
266271
CLANG_WARN_INT_CONVERSION = YES;
267272
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
273+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
268274
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
275+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
269276
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
270277
CLANG_WARN_STRICT_PROTOTYPES = YES;
271278
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -284,7 +291,7 @@
284291
GCC_WARN_UNINITIALIZED_AUTOS = YES;
285292
GCC_WARN_UNUSED_FUNCTION = YES;
286293
GCC_WARN_UNUSED_VARIABLE = YES;
287-
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
294+
IPHONEOS_DEPLOYMENT_TARGET = 12.4;
288295
SDKROOT = iphoneos;
289296
VALIDATE_PRODUCT = YES;
290297
VALID_ARCHS = "armv7 armv7s i386 arm64 x86_64";

module/android/build_steps.json

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,18 @@
44
{ "do": { "android_add_gradle_manifest_placeholder": {
55
"key": "appAuthRedirectScheme",
66
"value": "{{modules.oauth.config.redirect_scheme}}"
7-
} } }
7+
} } },
8+
{ "do": { "android_add_to_manifest": { "element": {
9+
"tag": "queries",
10+
"children": [
11+
{
12+
"tag": "intent",
13+
"children": [
14+
{ "tag": "action", "attributes": { "android:name": "android.intent.action.VIEW" } },
15+
{ "tag": "category", "attributes": { "android:name": "android.intent.category.APP_BROWSER" } },
16+
{ "tag": "data", "attributes": { "android:scheme": "https" } }
17+
]
18+
}
19+
]
20+
} } } }
821
]

module/manifest.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"changes": "* Bump AppAuth-Android SDK to 0.7.1\n* Bump AppAuth-iOS SDK to 1.1.0\n* Migrate module to androidx\nFixed: iOS 13 SDK breaks oauth logon\nFixed: Crash on Android when attempting a Google login",
2+
"changes": "* Updated for Android 11\n* Updated for iOS 14",
33
"description": "Integrate OAuth 2.0 and OpenID Connect providers with your app.",
4-
"min_platform_version": "v2.8.0",
4+
"min_platform_version": "v2.9.0",
55
"namespace": "oauth",
6-
"platform_version": "v2.8.0",
7-
"version": "1.0"
6+
"platform_version": "v2.9.0",
7+
"version": "1.1"
88
}

0 commit comments

Comments
 (0)