Skip to content

Commit 1abaccf

Browse files
committed
Fixing up CircleCI pipeline
1 parent 9a1ae72 commit 1abaccf

File tree

5 files changed

+21
-16
lines changed

5 files changed

+21
-16
lines changed

.circleci/config.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
version: 2.1
2+
jobs:
3+
build:
4+
macos:
5+
xcode: 14.0.0
6+
steps:
7+
- checkout
8+
- run:
9+
name: Make
10+
command: |
11+
make test-circle-ci

Example Apps/ExampleApp-iOS.xcodeproj/project.pbxproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@
182182
developmentRegion = English;
183183
hasScannedForEncodings = 0;
184184
knownRegions = (
185+
English,
185186
en,
186187
);
187188
mainGroup = 2CEB3EB01602563600548120;
@@ -319,7 +320,7 @@
319320
GCC_PRECOMPILE_PREFIX_HEADER = YES;
320321
GCC_PREFIX_HEADER = "ExampleApp-iOS/ExampleApp-iOS-Prefix.pch";
321322
INFOPLIST_FILE = "ExampleApp-iOS/ExampleApp-iOS-Info.plist";
322-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
323+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
323324
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
324325
PRODUCT_BUNDLE_IDENTIFIER = "com.example.${PRODUCT_NAME:rfc1034identifier}";
325326
PRODUCT_NAME = "ExampleApp-iOS";
@@ -336,7 +337,7 @@
336337
GCC_PRECOMPILE_PREFIX_HEADER = YES;
337338
GCC_PREFIX_HEADER = "ExampleApp-iOS/ExampleApp-iOS-Prefix.pch";
338339
INFOPLIST_FILE = "ExampleApp-iOS/ExampleApp-iOS-Info.plist";
339-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
340+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
340341
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
341342
PRODUCT_BUNDLE_IDENTIFIER = "com.example.${PRODUCT_NAME:rfc1034identifier}";
342343
PRODUCT_NAME = "ExampleApp-iOS";

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ test-many:
1212

1313
test-circle-ci:
1414
xcodebuild test -project Tests/WebViewJavascriptBridge.xcodeproj -scheme WebViewJavascriptBridge \
15-
-destination 'platform=iOS Simulator,name=iPhone 7,OS=10.3.1' \
16-
-destination 'platform=iOS Simulator,name=iPhone X,OS=11.0.1'
15+
-destination 'platform=iOS Simulator,name=iPhone 13,OS=15.5' \
16+
-destination 'platform=iOS Simulator,name=iPhone 14,OS=16.0'
1717

1818

1919
publish-pod:

Tests/WebViewJavascriptBridge.xcodeproj/project.pbxproj

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,7 @@
223223
developmentRegion = English;
224224
hasScannedForEncodings = 0;
225225
knownRegions = (
226+
English,
226227
en,
227228
Base,
228229
);
@@ -397,6 +398,7 @@
397398
"$(inherited)",
398399
);
399400
INFOPLIST_FILE = WebViewJavascriptBridgeTests/Info.plist;
401+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
400402
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
401403
PRODUCT_BUNDLE_IDENTIFIER = "in.marcuswestin.WebViewJavascriptBridge.$(PRODUCT_NAME:rfc1034identifier)";
402404
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -415,6 +417,7 @@
415417
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
416418
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
417419
INFOPLIST_FILE = WebViewJavascriptBridgeTests/Info.plist;
420+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
418421
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
419422
PRODUCT_BUNDLE_IDENTIFIER = "in.marcuswestin.WebViewJavascriptBridge.$(PRODUCT_NAME:rfc1034identifier)";
420423
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -434,7 +437,7 @@
434437
"$(inherited)",
435438
);
436439
INFOPLIST_FILE = WebViewJavascriptBridgeTestHost/Info.plist;
437-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
440+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
438441
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
439442
PRODUCT_BUNDLE_IDENTIFIER = "in.marcuswestin.$(PRODUCT_NAME:rfc1034identifier)";
440443
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -446,7 +449,7 @@
446449
buildSettings = {
447450
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
448451
INFOPLIST_FILE = WebViewJavascriptBridgeTestHost/Info.plist;
449-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
452+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
450453
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
451454
PRODUCT_BUNDLE_IDENTIFIER = "in.marcuswestin.$(PRODUCT_NAME:rfc1034identifier)";
452455
PRODUCT_NAME = "$(TARGET_NAME)";

circle.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)