diff --git a/.gitmodules b/.gitmodules index 4827716..e7e059b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,5 +1,5 @@ [submodule "Carthage/Checkouts/Swiftx"] - url = https://github.com/typelift/Swiftx.git + url = https://github.com/sharecare/Swiftx.git path = Carthage/Checkouts/Swiftx [submodule "Carthage/Checkouts/FileCheck"] path = Carthage/Checkouts/FileCheck @@ -9,4 +9,4 @@ url = https://github.com/typelift/Operadics.git [submodule "Carthage/Checkouts/SwiftCheck"] path = Carthage/Checkouts/SwiftCheck - url = https://github.com/typelift/SwiftCheck.git + url = https://github.com/sharecare/SwiftCheck.git diff --git a/.travis.yml b/.travis.yml index 30cb210..b657800 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ matrix: include: - os: osx language: objective-c - osx_image: xcode10.2 + osx_image: xcode11.2 before_install: - git submodule update --init --recursive script: @@ -13,14 +13,14 @@ matrix: - carthage build --no-skip-current - os: osx language: objective-c - osx_image: xcode10.2 + osx_image: xcode11.2 before_install: - git submodule update --init --recursive script: - set -o pipefail - xcodebuild test -scheme Swiftz | xcpretty -c - - xcodebuild build-for-testing -scheme Swiftz-iOS -destination "platform=iOS Simulator,name=iPad Pro (12.9-inch) (2nd generation)" | xcpretty -c - - xcodebuild test -scheme Swiftz-iOS -destination "platform=iOS Simulator,name=iPad Pro (12.9-inch) (2nd generation)" | xcpretty -c + - xcodebuild build-for-testing -scheme Swiftz-iOS -destination "platform=iOS Simulator,name=iPad Pro (12.9-inch) (3rd generation)" | xcpretty -c + - xcodebuild test -scheme Swiftz-iOS -destination "platform=iOS Simulator,name=iPad Pro (12.9-inch) (3rd generation)" | xcpretty -c - xcodebuild build-for-testing -scheme Swiftz-tvOS -destination 'platform=tvOS Simulator,name=Apple TV 4K (at 1080p)' | xcpretty -c - xcodebuild test -scheme Swiftz-tvOS -destination 'platform=tvOS Simulator,name=Apple TV 4K (at 1080p)' | xcpretty -c - os: linux diff --git a/.whitesource b/.whitesource new file mode 100644 index 0000000..3e16538 --- /dev/null +++ b/.whitesource @@ -0,0 +1,3 @@ +{ + "settingsInheritedFrom": "Sharecare/whitesource-config@main" +} \ No newline at end of file diff --git a/Cartfile.private b/Cartfile.private index b49b1bf..a3366f6 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1,3 +1,3 @@ -github "typelift/Swiftx" -github "typelift/SwiftCheck" +github "sharecare/Swiftx" "master" +github "sharecare/SwiftCheck" "master" github "typelift/Operadics" diff --git a/Cartfile.resolved b/Cartfile.resolved index 0ae3264..80a9ac5 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,3 +1,3 @@ +github "sharecare/SwiftCheck" "c3bb2da15f0d9689eefd85394694d4f5057d5ea6" +github "sharecare/Swiftx" "4affb6451b6981cf56c2ec1287aaee3406a5e5e0" github "typelift/Operadics" "0.4.0" -github "typelift/SwiftCheck" "0.12.0" -github "typelift/Swiftx" "0.8.0" diff --git a/Carthage/Checkouts/SwiftCheck b/Carthage/Checkouts/SwiftCheck index 077c096..c3bb2da 160000 --- a/Carthage/Checkouts/SwiftCheck +++ b/Carthage/Checkouts/SwiftCheck @@ -1 +1 @@ -Subproject commit 077c096c3ddfc38db223ac8e525ad16ffb987138 +Subproject commit c3bb2da15f0d9689eefd85394694d4f5057d5ea6 diff --git a/securityconfig.json b/securityconfig.json new file mode 100644 index 0000000..fb0b960 --- /dev/null +++ b/securityconfig.json @@ -0,0 +1,12 @@ +{ + "team": "Berlin", + "team_owner": "Dan Eckert", + "team_poc": "Dimitrios Georgakopoulos", + "risk_assessment": { + "usesDeidentifiedData": false, + "sourcedFromPHIorPII": false, + "appPubliclyAccessible": true, + "containsPII": true, + "containsPHI": true + } +}