Merge branch 'release/3.0.0'

SRGSSR · Oct 23, 2020 · 734fe39 · 734fe39
2 parents ecf83ba + 2cd1912
commit 734fe39
Show file tree

Hide file tree

Showing 61 changed files with 198 additions and 1,393 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,13 +1,13 @@
 .DS_Store
 
+/.build
+/Packages
+/*.xcodeproj
+xcuserdata/
+
 *.xcscmblueprint
 xcuserdata
 
-/archive
-/build
-
-/Carthage
-
 /fastlane/*.xcresult
 /fastlane/*.xml
 

diff --git a/...ject.xcworkspace/contents.xcworkspacedata → ...kage.xcworkspace/contents.xcworkspacedata b/...ject.xcworkspace/contents.xcworkspacedata → ...kage.xcworkspace/contents.xcworkspacedata
diff --git a/...ace/xcshareddata/IDEWorkspaceChecks.plist → ...xcshareddata/WorkspaceSettings.xcsettings b/...ace/xcshareddata/IDEWorkspaceChecks.plist → ...xcshareddata/WorkspaceSettings.xcsettings
@@ -2,7 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
+	<key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
+	<false/>
 </dict>
 </plist>
diff --git a/...cshareddata/xcschemes/SRGNetwork.xcscheme → ...cshareddata/xcschemes/SRGNetwork.xcscheme b/...cshareddata/xcschemes/SRGNetwork.xcscheme → ...cshareddata/xcschemes/SRGNetwork.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1150"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,10 +14,38 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "6F8A942220FF21EB00AA6434"
-               BuildableName = "SRGNetwork.framework"
+               BlueprintIdentifier = "SRGNetwork_SRGNetwork"
+               BuildableName = "SRGNetwork_SRGNetwork"
+               BlueprintName = "SRGNetwork_SRGNetwork"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "SRGNetwork"
+               BuildableName = "SRGNetwork"
                BlueprintName = "SRGNetwork"
-               ReferencedContainer = "container:SRGNetwork.xcodeproj">
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "SRGNetworkTests"
+               BuildableName = "SRGNetworkTests"
+               BlueprintName = "SRGNetworkTests"
+               ReferencedContainer = "container:">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -27,26 +55,17 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "6F8A942220FF21EB00AA6434"
-            BuildableName = "SRGNetwork.framework"
-            BlueprintName = "SRGNetwork"
-            ReferencedContainer = "container:SRGNetwork.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO"
             parallelizable = "YES"
             testExecutionOrdering = "random">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "6F6A09F12101BD11004568BD"
-               BuildableName = "SRGNetwork-tests.xctest"
-               BlueprintName = "SRGNetwork-tests"
-               ReferencedContainer = "container:SRGNetwork.xcodeproj">
+               BlueprintIdentifier = "SRGNetworkTests"
+               BuildableName = "SRGNetworkTests"
+               BlueprintName = "SRGNetworkTests"
+               ReferencedContainer = "container:">
             </BuildableReference>
          </TestableReference>
       </Testables>
@@ -61,15 +80,6 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "6F8A942220FF21EB00AA6434"
-            BuildableName = "SRGNetwork.framework"
-            BlueprintName = "SRGNetwork"
-            ReferencedContainer = "container:SRGNetwork.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -80,10 +90,10 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "6F8A942220FF21EB00AA6434"
-            BuildableName = "SRGNetwork.framework"
-            BlueprintName = "SRGNetwork"
-            ReferencedContainer = "container:SRGNetwork.xcodeproj">
+            BlueprintIdentifier = "SRGNetwork_SRGNetwork"
+            BuildableName = "SRGNetwork_SRGNetwork"
+            BlueprintName = "SRGNetwork_SRGNetwork"
+            ReferencedContainer = "container:">
          </BuildableReference>
       </MacroExpansion>
    </ProfileAction>

diff --git a/Cartfile b/Cartfile
diff --git a/Cartfile.resolved b/Cartfile.resolved
diff --git a/Common.xcconfig b/Common.xcconfig
diff --git a/Framework/Framework.xcconfig b/Framework/Framework.xcconfig
diff --git a/Framework/Info.plist b/Framework/Info.plist
diff --git a/Framework/Resources/Info.plist b/Framework/Resources/Info.plist
diff --git a/Framework/Sources/Categories/NSBundle+SRGNetwork.m b/Framework/Sources/Categories/NSBundle+SRGNetwork.m
diff --git a/Framework/Sources/SRGNetworkActivityManagement+Private.h b/Framework/Sources/SRGNetworkActivityManagement+Private.h
diff --git a/Makefile b/Makefile
@@ -1,47 +1,24 @@
 #!/usr/bin/xcrun make -f
 
-CARTHAGE_FOLDER=Carthage
-CARTHAGE_FLAGS=--platform iOS,tvOS,watchOS --cache-builds --new-resolver
-
 .PHONY: all
-all: bootstrap
-	@echo "Building the project..."
-	@xcodebuild build
-	@echo "... done.\n"
-
-.PHONY: bootstrap
-bootstrap:
-	@echo "Bootstrapping dependencies..."
-	@carthage bootstrap $(CARTHAGE_FLAGS)
-	@echo "... done.\n"
-
-.PHONY: update
-update:
-	@echo "Updating dependencies..."
-	@carthage update $(CARTHAGE_FLAGS)
-	@echo "... done.\n"
+all: test-ios test-tvos
 
-.PHONY: package
-package: bootstrap
-	@echo "Packaging binaries..."
-	@mkdir -p archive
-	@carthage build --no-skip-current
-	@carthage archive --output archive
+.PHONY: test-ios
+test-ios:
+	@echo "Running iOS unit tests..."
+	@xcodebuild test -scheme SRGNetwork -destination 'platform=iOS Simulator,name=iPhone 11' 2> /dev/null
 	@echo "... done.\n"
 
-.PHONY: clean
-clean:
-	@echo "Cleaning up build products..."
-	@xcodebuild clean
-	@rm -rf $(CARTHAGE_FOLDER)
+.PHONY: test-tvos
+test-tvos:
+	@echo "Running tvOS unit tests..."
+	@xcodebuild test -scheme SRGNetwork -destination 'platform=tvOS Simulator,name=Apple TV' 2> /dev/null
 	@echo "... done.\n"
 
 .PHONY: help
 help:
 	@echo "The following targets are available:"
-	@echo "   all                         Build project dependencies and the project"
-	@echo "   bootstrap                   Build dependencies as declared in Cartfile.resolved"
-	@echo "   update                      Update and build dependencies"
-	@echo "   package                     Build and package the framework for attaching to github releases"
-	@echo "   clean                       Clean the project and its dependencies"
-	@echo "   help                        Display this message"
+	@echo "   all                 Build and run unit tests for all platforms"
+	@echo "   test-ios            Build and run unit tests for iOS"
+	@echo "   test-tvos           Build and run unit tests for tvOS"
+	@echo "   help                Display this help message"
diff --git a/Package.resolved b/Package.resolved
@@ -0,0 +1,34 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "libextobjc",
+        "repositoryURL": "https://github.com/SRGSSR/libextobjc.git",
+        "state": {
+          "branch": null,
+          "revision": "30ee5b73bdf57a826978aa146881277f22369be1",
+          "version": "0.6.0-srg3"
+        }
+      },
+      {
+        "package": "MAKVONotificationCenter",
+        "repositoryURL": "https://github.com/SRGSSR/MAKVONotificationCenter.git",
+        "state": {
+          "branch": null,
+          "revision": "60395e0601ffd4a784856b423d4cac558366276d",
+          "version": "1.0.0-srg5"
+        }
+      },
+      {
+        "package": "SRGLogger",
+        "repositoryURL": "https://github.com/SRGSSR/srglogger-apple.git",
+        "state": {
+          "branch": null,
+          "revision": "cfc39d1223ed039aeb7df38c6c7570977b22d1aa",
+          "version": "3.0.0"
+        }
+      }
+    ]
+  },
+  "version": 1
+}