Skip to content

Commit 6f281c1

Browse files
syoung-smallwisdomsyoung-smallwisdom
committed
Add RSDTest back into the workspace bc looks like permissions handling changed again
1 parent 342c22c commit 6f281c1

File tree

5 files changed

+25
-25
lines changed

5 files changed

+25
-25
lines changed

‎RSDCatalog/RSDCatalog.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@
7979

8080
/* Begin PBXFileReference section */
8181
F801218122755548003A1A5C /* ResearchRecorders.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = ResearchRecorders.framework; sourceTree = BUILT_PRODUCTS_DIR; };
82-
F830840B21F2686C0055F9B8 /* MotorControl.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = MotorControl.framework; sourceTree = BUILT_PRODUCTS_DIR; };
8382
F836460A2265281400CCA0EF /* TaskPresentationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TaskPresentationViewController.swift; sourceTree = "<group>"; };
8483
F836460C22652E6000CCA0EF /* TaskArchivesTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TaskArchivesTableViewController.swift; sourceTree = "<group>"; };
8584
F8373C9220964F60004DD4E1 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
@@ -89,7 +88,6 @@
8988
F84DDB6C20955628009CC1B8 /* Photos.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Photos.framework; path = System/Library/Frameworks/Photos.framework; sourceTree = SDKROOT; };
9089
F871AA5022610D2F00C0F657 /* ColorPalettes.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = ColorPalettes.json; sourceTree = "<group>"; };
9190
F871AA5222610E8900C0F657 /* PaletteSelectionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaletteSelectionViewController.swift; sourceTree = "<group>"; };
92-
F8A503702225FE40005F1C0C /* CardiorespiratoryFitness.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = CardiorespiratoryFitness.framework; sourceTree = BUILT_PRODUCTS_DIR; };
9391
F8D42A4F2095518400C6A4BC /* RSDCatalog.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RSDCatalog.app; sourceTree = BUILT_PRODUCTS_DIR; };
9492
F8D42A522095518400C6A4BC /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
9593
F8D42A592095518400C6A4BC /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -244,8 +242,6 @@
244242
F8D42AB52095550C00C6A4BC /* Research.framework */,
245243
F8D42AB72095550C00C6A4BC /* ResearchUI.framework */,
246244
F801218122755548003A1A5C /* ResearchRecorders.framework */,
247-
F8A503702225FE40005F1C0C /* CardiorespiratoryFitness.framework */,
248-
F830840B21F2686C0055F9B8 /* MotorControl.framework */,
249245
F84DDB6C20955628009CC1B8 /* Photos.framework */,
250246
F84DDB6B20955628009CC1B8 /* AVFoundation.framework */,
251247
F84DDB6920955628009CC1B8 /* CoreLocation.framework */,

‎RSDTest/RSDTest.xcodeproj/project.pbxproj‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
/* Begin PBXBuildFile section */
1010
F8373C8920964EC7004DD4E1 /* RSDTestTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8373C8820964EC7004DD4E1 /* RSDTestTests.swift */; };
1111
F8B1777E202CD31700B62416 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = F8B1777D202CD31700B62416 /* README.md */; };
12-
F8B17823202D4E8400B62416 /* ResearchUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8B17822202D4E8400B62416 /* ResearchUI.framework */; };
13-
F8B17824202D4E8400B62416 /* ResearchUI.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = F8B17822202D4E8400B62416 /* ResearchUI.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
14-
F8B17827202D4E8C00B62416 /* Research.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8B17826202D4E8C00B62416 /* Research.framework */; };
15-
F8B17828202D4E8C00B62416 /* Research.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = F8B17826202D4E8C00B62416 /* Research.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
12+
F8D86F132280B27600897CDF /* Research.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8B17826202D4E8C00B62416 /* Research.framework */; };
13+
F8D86F142280B27600897CDF /* Research.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = F8B17826202D4E8C00B62416 /* Research.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
14+
F8D86F152280B27600897CDF /* ResearchUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8B17822202D4E8400B62416 /* ResearchUI.framework */; };
15+
F8D86F162280B27600897CDF /* ResearchUI.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = F8B17822202D4E8400B62416 /* ResearchUI.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1616
FF2415611F7AC31800D0BA5C /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF2415601F7AC31800D0BA5C /* AppDelegate.swift */; };
1717
FF2415631F7AC31800D0BA5C /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF2415621F7AC31800D0BA5C /* ViewController.swift */; };
1818
FF2415661F7AC31800D0BA5C /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = FF2415641F7AC31800D0BA5C /* Main.storyboard */; };
@@ -33,14 +33,14 @@
3333
/* End PBXContainerItemProxy section */
3434

3535
/* Begin PBXCopyFilesBuildPhase section */
36-
F8B17825202D4E8400B62416 /* Embed Frameworks */ = {
36+
F8D86F172280B27600897CDF /* Embed Frameworks */ = {
3737
isa = PBXCopyFilesBuildPhase;
3838
buildActionMask = 2147483647;
3939
dstPath = "";
4040
dstSubfolderSpec = 10;
4141
files = (
42-
F8B17828202D4E8C00B62416 /* Research.framework in Embed Frameworks */,
43-
F8B17824202D4E8400B62416 /* ResearchUI.framework in Embed Frameworks */,
42+
F8D86F142280B27600897CDF /* Research.framework in Embed Frameworks */,
43+
F8D86F162280B27600897CDF /* ResearchUI.framework in Embed Frameworks */,
4444
);
4545
name = "Embed Frameworks";
4646
runOnlyForDeploymentPostprocessing = 0;
@@ -78,8 +78,8 @@
7878
isa = PBXFrameworksBuildPhase;
7979
buildActionMask = 2147483647;
8080
files = (
81-
F8B17827202D4E8C00B62416 /* Research.framework in Frameworks */,
82-
F8B17823202D4E8400B62416 /* ResearchUI.framework in Frameworks */,
81+
F8D86F132280B27600897CDF /* Research.framework in Frameworks */,
82+
F8D86F152280B27600897CDF /* ResearchUI.framework in Frameworks */,
8383
);
8484
runOnlyForDeploymentPostprocessing = 0;
8585
};
@@ -98,6 +98,8 @@
9898
F8B177E9202D330D00B62416 /* Frameworks */ = {
9999
isa = PBXGroup;
100100
children = (
101+
F8B17826202D4E8C00B62416 /* Research.framework */,
102+
F8B17822202D4E8400B62416 /* ResearchUI.framework */,
101103
);
102104
name = Frameworks;
103105
sourceTree = "<group>";
@@ -109,8 +111,6 @@
109111
FF24155F1F7AC31800D0BA5C /* RSDTest */,
110112
F8373C8720964EC7004DD4E1 /* RSDTestTests */,
111113
FF24155E1F7AC31800D0BA5C /* Products */,
112-
F8B17826202D4E8C00B62416 /* Research.framework */,
113-
F8B17822202D4E8400B62416 /* ResearchUI.framework */,
114114
F8B177E9202D330D00B62416 /* Frameworks */,
115115
);
116116
sourceTree = "<group>";
@@ -184,7 +184,7 @@
184184
FF2415591F7AC31800D0BA5C /* Sources */,
185185
FF24155A1F7AC31800D0BA5C /* Frameworks */,
186186
FF24155B1F7AC31800D0BA5C /* Resources */,
187-
F8B17825202D4E8400B62416 /* Embed Frameworks */,
187+
F8D86F172280B27600897CDF /* Embed Frameworks */,
188188
);
189189
buildRules = (
190190
);
@@ -207,13 +207,13 @@
207207
TargetAttributes = {
208208
F8373C8520964EC7004DD4E1 = {
209209
CreatedOnToolsVersion = 9.3;
210-
LastSwiftMigration = 1000;
210+
LastSwiftMigration = 1020;
211211
ProvisioningStyle = Automatic;
212212
TestTargetID = FF24155C1F7AC31800D0BA5C;
213213
};
214214
FF24155C1F7AC31800D0BA5C = {
215215
CreatedOnToolsVersion = 9.0;
216-
LastSwiftMigration = 1000;
216+
LastSwiftMigration = 1020;
217217
ProvisioningStyle = Manual;
218218
SystemCapabilities = {
219219
com.apple.BackgroundModes = {
@@ -327,7 +327,7 @@
327327
PRODUCT_BUNDLE_IDENTIFIER = org.sagebase.RSDTestTests;
328328
PRODUCT_NAME = "$(TARGET_NAME)";
329329
PROVISIONING_PROFILE_SPECIFIER = "";
330-
SWIFT_VERSION = 4.2;
330+
SWIFT_VERSION = 5.0;
331331
TARGETED_DEVICE_FAMILY = "1,2";
332332
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/RSDTest.app/RSDTest";
333333
};
@@ -347,7 +347,7 @@
347347
PRODUCT_BUNDLE_IDENTIFIER = org.sagebase.RSDTestTests;
348348
PRODUCT_NAME = "$(TARGET_NAME)";
349349
PROVISIONING_PROFILE_SPECIFIER = "";
350-
SWIFT_VERSION = 4.2;
350+
SWIFT_VERSION = 5.0;
351351
TARGETED_DEVICE_FAMILY = "1,2";
352352
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/RSDTest.app/RSDTest";
353353
};
@@ -483,7 +483,7 @@
483483
PRODUCT_NAME = "$(TARGET_NAME)";
484484
PROVISIONING_PROFILE = "877c46a3-e438-4856-ab71-0df11d8f51c4";
485485
PROVISIONING_PROFILE_SPECIFIER = "match Development: org.sagebase.RSDTest";
486-
SWIFT_VERSION = 4.2;
486+
SWIFT_VERSION = 5.0;
487487
TARGETED_DEVICE_FAMILY = "1,2";
488488
};
489489
name = Debug;
@@ -506,7 +506,7 @@
506506
PRODUCT_NAME = "$(TARGET_NAME)";
507507
PROVISIONING_PROFILE = "84a674c1-10a5-4b79-b2e8-05507424ffec";
508508
PROVISIONING_PROFILE_SPECIFIER = "match Distribution: org.sagebase.RSDTest";
509-
SWIFT_VERSION = 4.2;
509+
SWIFT_VERSION = 5.0;
510510
TARGETED_DEVICE_FAMILY = "1,2";
511511
};
512512
name = Release;

‎Research.xcworkspace/contents.xcworkspacedata‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Research/Research.xcodeproj/project.pbxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
F801217922751561003A1A5C /* RSDLocationAuthorization.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8E94FF020585ED100752B7B /* RSDLocationAuthorization.swift */; };
3030
F801217A22751561003A1A5C /* RSDMotionAuthorization.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8E94FF42058602F00752B7B /* RSDMotionAuthorization.swift */; };
3131
F801217B22751561003A1A5C /* RSDPhotoLibraryAuthorization.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8E94FFA20586D7500752B7B /* RSDPhotoLibraryAuthorization.swift */; };
32-
F801217C2275157D003A1A5C /* ResearchRecorders.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F814DCE722750435004579EF /* ResearchRecorders.framework */; };
32+
F801217C2275157D003A1A5C /* ResearchRecorders.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F814DCE722750435004579EF /* ResearchRecorders.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
3333
F801218022755516003A1A5C /* Research.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FF8B53141FCE678E006B6937 /* Research.framework */; };
3434
F802F3E3204DF2B80027CB00 /* RSDUIStep.swift in Sources */ = {isa = PBXBuildFile; fileRef = F802F3E2204DF2B80027CB00 /* RSDUIStep.swift */; };
3535
F802F3E4204DF2B80027CB00 /* RSDUIStep.swift in Sources */ = {isa = PBXBuildFile; fileRef = F802F3E2204DF2B80027CB00 /* RSDUIStep.swift */; };

‎travis/build.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then # on pull requests
88
elif [[ -z "$TRAVIS_TAG" && "$TRAVIS_BRANCH" == "master" ]]; then # non-tag commits to master branch
99
FASTLANE_EXPLICIT_OPEN_SIMULATOR=2 bundle exec fastlane test scheme:"RSDCatalog"
1010
bundle exec fastlane keychains
11-
bundle exec fastlane ci_archive scheme:"RSDCatalog" export_method:"app-store"
11+
bundle exec fastlane ci_archive scheme:"RSDCatalog" export_method:"app-store"
12+
bundle exec fastlane ci_archive scheme:"RSDTest" export_method:"app-store"
1213
bundle exec fastlane build scheme:"Research-watchOS"
1314
bundle exec fastlane build scheme:"Research-tvOS"
1415
bundle exec fastlane build scheme:"Research-macOS"
@@ -17,6 +18,6 @@ elif [[ -z "$TRAVIS_TAG" && "$TRAVIS_BRANCH" =~ ^stable-.* ]]; then # non-tag co
1718
bundle exec fastlane bump_all
1819
bundle exec fastlane keychains
1920
bundle exec fastlane beta scheme:"RSDCatalog" export_method:"app-store" project:"RSDCatalog/RSDCatalog.xcodeproj"
20-
# bundle exec fastlane beta scheme:"RSDTest" export_method:"app-store" project:"RSDTest/RSDTest.xcodeproj"
21+
bundle exec fastlane beta scheme:"RSDTest" export_method:"app-store" project:"RSDTest/RSDTest.xcodeproj"
2122
fi
2223
exit $?

0 commit comments

Comments
 (0)