build(core): update dependencies to use new core

jeff-arn · jeff-arn · commit dbfdb19d46cb · 2019-10-04T12:54:07.000-04:00
additionally, update swift_versions in podspecs

BREAKING CHANGE: uses new core framework
diff --git a/Cartfile b/Cartfile
@@ -1,3 +1,2 @@
 github "daltoniam/Starscream" == 3.0.5
-github "IBM/swift-sdk-core" "feat/error-handling"
-
+github "IBM/swift-sdk-core" ~> 1.0.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,2 +1,2 @@
-github "IBM/swift-sdk-core" "a55200f02f07073d6414c579d9e24e701337b77b"
+github "IBM/swift-sdk-core" "1.0.0"
 github "daltoniam/Starscream" "3.0.5"
diff --git a/IBMWatsonAssistantV1.podspec b/IBMWatsonAssistantV1.podspec
@@ -21,7 +21,7 @@ natural-language input and uses machine learning to respond to customers in a wa
                             'Source/SupportingFiles/Shared.swift'
   s.exclude_files         = 'Source/AssistantV1/Shared.swift'
 
-  s.swift_version         = '4.2'
-  s.dependency              'IBMWatsonRestKit', '~> 3.0.0'
+  s.swift_version         = ['4.2', '5.0', '5.1']
+  s.dependency              'IBMSwiftSDKCore', '~> 1.0.0'
 
 end
diff --git a/IBMWatsonAssistantV2.podspec b/IBMWatsonAssistantV2.podspec
@@ -21,7 +21,7 @@ natural-language input and uses machine learning to respond to customers in a wa
                             'Source/SupportingFiles/Shared.swift'
   s.exclude_files         = 'Source/AssistantV2/Shared.swift'
 
-  s.swift_version         = '4.2'
-  s.dependency              'IBMWatsonRestKit', '~> 3.0.0'
+  s.swift_version         = ['4.2', '5.0', '5.1']
+  s.dependency              'IBMSwiftSDKCore', '~> 1.0.0'
 
 end
diff --git a/IBMWatsonCompareComplyV1.podspec b/IBMWatsonCompareComplyV1.podspec
@@ -20,7 +20,7 @@ IBM Watson™ Compare and Comply analyzes governing documents to provide details
                             'Source/SupportingFiles/Shared.swift'
   s.exclude_files         = 'Source/CompareComplyV1/Shared.swift'
 
-  s.swift_version         = '4.2'
-  s.dependency              'IBMWatsonRestKit', '~> 3.0.0'
+  s.swift_version         = ['4.2', '5.0', '5.1']
+  s.dependency              'IBMSwiftSDKCore', '~> 1.0.0'
 
 end
diff --git a/IBMWatsonDiscoveryV1.podspec b/IBMWatsonDiscoveryV1.podspec
@@ -22,7 +22,7 @@ as well as public and third-party data.
                             'Source/SupportingFiles/Shared.swift'
   s.exclude_files         = 'Source/DiscoveryV1/Shared.swift'
 
-  s.swift_version         = '4.2'
-  s.dependency              'IBMWatsonRestKit', '~> 3.0.0'
+  s.swift_version         = ['4.2', '5.0', '5.1']
+  s.dependency              'IBMSwiftSDKCore', '~> 1.0.0'
 
 end
diff --git a/IBMWatsonLanguageTranslatorV3.podspec b/IBMWatsonLanguageTranslatorV3.podspec
@@ -20,7 +20,7 @@ IBM Watson™ Language Translator can identify the language of text and translat
                             'Source/SupportingFiles/Shared.swift'
   s.exclude_files         = 'Source/LanguageTranslatorV3/Shared.swift'
 
-  s.swift_version         = '4.2'
-  s.dependency              'IBMWatsonRestKit', '~> 3.0.0'
+  s.swift_version         = ['4.2', '5.0', '5.1']
+  s.dependency              'IBMSwiftSDKCore', '~> 1.0.0'
 
 end
diff --git a/IBMWatsonNaturalLanguageClassifierV1.podspec b/IBMWatsonNaturalLanguageClassifierV1.podspec
@@ -22,7 +22,7 @@ return information for texts that it is not trained on.
                             'Source/SupportingFiles/Shared.swift'
   s.exclude_files         = 'Source/NaturalLanguageClassifierV1/Shared.swift'
 
-  s.swift_version         = '4.2'
-  s.dependency              'IBMWatsonRestKit', '~> 3.0.0'
+  s.swift_version         = ['4.2', '5.0', '5.1']
+  s.dependency              'IBMSwiftSDKCore', '~> 1.0.0'
 
 end
diff --git a/IBMWatsonNaturalLanguageUnderstandingV1.podspec b/IBMWatsonNaturalLanguageUnderstandingV1.podspec
@@ -21,7 +21,7 @@ including categories, concepts, emotion, entities, keywords, metadata, relations
                             'Source/SupportingFiles/Shared.swift'
   s.exclude_files         = 'Source/NaturalLanguageUnderstandingV1/Shared.swift'
 
-  s.swift_version         = '4.2'
-  s.dependency              'IBMWatsonRestKit', '~> 3.0.0'
+  s.swift_version         = ['4.2', '5.0', '5.1']
+  s.dependency              'IBMSwiftSDKCore', '~> 1.0.0'
 
 end
diff --git a/IBMWatsonPersonalityInsightsV3.podspec b/IBMWatsonPersonalityInsightsV3.podspec
@@ -21,7 +21,7 @@ from digital communications such as email, text messages, tweets, and forum post
                             'Source/SupportingFiles/Shared.swift'
   s.exclude_files         = 'Source/PersonalityInsightsV3/Shared.swift'
 
-  s.swift_version         = '4.2'
-  s.dependency              'IBMWatsonRestKit', '~> 3.0.0'
+  s.swift_version         = ['4.2', '5.0', '5.1']
+  s.dependency              'IBMSwiftSDKCore', '~> 1.0.0'
 
 end
diff --git a/IBMWatsonSpeechToTextV1.podspec b/IBMWatsonSpeechToTextV1.podspec
@@ -26,8 +26,8 @@ of the audio signal. It continuously returns and retroactively updates a transcr
                             '**/opus_header.h',
                             '**/opus_header.c'
 
-  s.swift_version         = '4.2'
-  s.dependency              'IBMWatsonRestKit', '~> 3.0.0'
+  s.swift_version         = ['4.2', '5.0', '5.1']
+  s.dependency              'IBMSwiftSDKCore', '~> 1.0.0'
   s.dependency              'Starscream', '3.0.5'
   s.vendored_libraries    = 'Source/SupportingFiles/Dependencies/Libraries/*.a'
 
diff --git a/IBMWatsonTextToSpeechV1.podspec b/IBMWatsonTextToSpeechV1.podspec
@@ -23,8 +23,8 @@ The service streams the results back to the client with minimal delay.
   s.exclude_files         = 'Source/TextToSpeechV1/Shared.swift',
                             '**/config_types.h'
 
-  s.swift_version         = '4.2'
-  s.dependency              'IBMWatsonRestKit', '~> 3.0.0'
+  s.swift_version         = ['4.2', '5.0', '5.1']
+  s.dependency              'IBMSwiftSDKCore', '~> 1.0.0'
   s.vendored_libraries    = 'Source/SupportingFiles/Dependencies/Libraries/*.a'
 
   # The renaming of libogg.a and libopus.a is done to avoid duplicate library name errors
diff --git a/IBMWatsonToneAnalyzerV3.podspec b/IBMWatsonToneAnalyzerV3.podspec
@@ -21,7 +21,6 @@ The service can analyze tone at both the document and sentence levels.
                             'Source/SupportingFiles/Shared.swift'
   s.exclude_files         = 'Source/ToneAnalyzerV3/Shared.swift'
 
-  s.swift_version         = '4.2'
-  s.dependency              'IBMWatsonRestKit', '~> 3.0.0'
-
+  s.swift_version         = ['4.2', '5.0', '5.1']
+  s.dependency              'IBMSwiftSDKCore', '~> 1.0.0'
 end
diff --git a/IBMWatsonVisualRecognitionV3.podspec b/IBMWatsonVisualRecognitionV3.podspec
@@ -21,7 +21,7 @@ scenes, objects, faces, and other content. The response includes keywords that p
                             'Source/SupportingFiles/Shared.swift'
   s.exclude_files         = 'Source/VisualRecognitionV3/Shared.swift'
 
-  s.swift_version         = '4.2'
-  s.dependency              'IBMWatsonRestKit', '~> 3.0.0'
+  s.swift_version         = ['4.2', '5.0', '5.1']
+  s.dependency              'IBMSwiftSDKCore', '~> 1.0.0'
 
 end
diff --git a/IBMWatsonVisualRecognitionV4.podspec b/IBMWatsonVisualRecognitionV4.podspec
@@ -21,7 +21,7 @@ scenes, objects, and other content. The response includes keywords that provide
                             'Source/SupportingFiles/Shared.swift'
   s.exclude_files         = 'Source/VisualRecognitionV4/Shared.swift'
 
-  s.swift_version         = '5.0'
-  s.dependency              'IBMSwiftSDKCore', '~> 3.0.0'
+  s.swift_version         = ['4.2', '5.0', '5.1']
+  s.dependency              'IBMSwiftSDKCore', '~> 1.0.0'
 
 end
diff --git a/Package.resolved b/Package.resolved
@@ -5,9 +5,9 @@
         "package": "IBMSwiftSDKCore",
         "repositoryURL": "https://github.com/IBM/swift-sdk-core",
         "state": {
-          "branch": "feat/error-handling",
-          "revision": "a692fa87730f51ec90c47680617b88e35892078e",
-          "version": null
+          "branch": null,
+          "revision": "4ec57773271fd73263adae2ca42f630bf1e2096d",
+          "version": "1.0.0"
         }
       }
     ]
diff --git a/Package.swift b/Package.swift
@@ -43,7 +43,7 @@ let package = Package(
         .library(name: "VisualRecognitionV4", targets: ["VisualRecognitionV4"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/IBM/swift-sdk-core", .branch("feat/error-handling"))
+        .package(url: "https://github.com/IBM/swift-sdk-core", from: "1.0.0")
     ],
     targets: [
         .target(name: "AssistantV1", dependencies: ["IBMSwiftSDKCore"]),

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-github "IBM/swift-sdk-core" "a55200f02f07073d6414c579d9e24e701337b77b"`
	`1`	`+github "IBM/swift-sdk-core" "1.0.0"`
`2`	`2`	`github "daltoniam/Starscream" "3.0.5"`
Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@`
`5`	`5`	`"package": "IBMSwiftSDKCore",`
`6`	`6`	`"repositoryURL": "https://github.com/IBM/swift-sdk-core",`
`7`	`7`	`"state": {`
`8`		`- "branch": "feat/error-handling",`
`9`		`- "revision": "a692fa87730f51ec90c47680617b88e35892078e",`
`10`		`- "version": null`
	`8`	`+ "branch": null,`
	`9`	`+ "revision": "4ec57773271fd73263adae2ca42f630bf1e2096d",`
	`10`	`+ "version": "1.0.0"`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`	`]`