Merge pull request #524 from NordicSemiconductor/fix/carthage

Carthage configuration fixed
NordicSemiconductor · Nov 30, 2023 · 92d3e90 · 92d3e90
2 parents 8efb31f + ef2d5ec
commit 92d3e90
Show file tree

Hide file tree

Showing 322 changed files with 1,804 additions and 1,633 deletions.
diff --git a/App/nRF DFU.xcodeproj/xcshareddata/xcschemes/dfu.xcscheme b/App/nRF DFU.xcodeproj/xcshareddata/xcschemes/dfu.xcscheme
@@ -28,16 +28,6 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "8DEF02F227EB48A400838144"
-               BuildableName = "dfuTests.xctest"
-               BlueprintName = "dfuTests"
-               ReferencedContainer = "container:nRF DFU.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
          <TestableReference
             skipped = "NO">
             <BuildableReference

diff --git a/...ary/Assets/Documentation.docc/DFUState.md → ...ry/Classes/Documentation.docc/DFUState.md b/...ary/Assets/Documentation.docc/DFUState.md → ...ry/Classes/Documentation.docc/DFUState.md
diff --git a/...ssets/Documentation.docc/Documentation.md → ...asses/Documentation.docc/Documentation.md b/...ssets/Documentation.docc/Documentation.md → ...asses/Documentation.docc/Documentation.md
diff --git a/...ary/Assets/Documentation.docc/LogLevel.md → ...ry/Classes/Documentation.docc/LogLevel.md b/...ary/Assets/Documentation.docc/LogLevel.md → ...ry/Classes/Documentation.docc/LogLevel.md
diff --git a/NordicDFU.xcodeproj/project.pbxproj b/NordicDFU.xcodeproj/project.pbxproj
diff --git a/NordicDFU.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/NordicDFU.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/NordicDFU.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/NordicDFU.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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/>
+</dict>
+</plist>
diff --git a/NordicDFU.xcodeproj/xcshareddata/xcschemes/NordicDFU.xcscheme b/NordicDFU.xcodeproj/xcshareddata/xcschemes/NordicDFU.xcscheme
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1500"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "F09DFFA52B175F50002F844E"
+               BuildableName = "NordicDFU.framework"
+               BlueprintName = "NordicDFU"
+               ReferencedContainer = "container:NordicDFU.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Release"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:NordicDFU.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "F09DFFA52B175F50002F844E"
+            BuildableName = "NordicDFU.framework"
+            BlueprintName = "NordicDFU"
+            ReferencedContainer = "container:NordicDFU.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/...roj/xcshareddata/xcschemes/Tests.xcscheme → ...reddata/xcschemes/NordicDFUTests.xcscheme b/...roj/xcshareddata/xcschemes/Tests.xcscheme → ...reddata/xcschemes/NordicDFUTests.xcscheme
@@ -14,13 +14,14 @@
       shouldAutocreateTestPlan = "YES">
       <Testables>
          <TestableReference
-            skipped = "NO">
+            skipped = "NO"
+            parallelizable = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "607FACE41AFB9204008FA782"
-               BuildableName = "Tests.xctest"
-               BlueprintName = "Tests"
-               ReferencedContainer = "container:DFU Test Performer.xcodeproj">
+               BlueprintIdentifier = "F09D00312B176A23002F844E"
+               BuildableName = "NordicDFUTests.xctest"
+               BlueprintName = "NordicDFUTests"
+               ReferencedContainer = "container:NordicDFU.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>

diff --git a/NordicDFU.xctestplan b/NordicDFU.xctestplan
@@ -0,0 +1,24 @@
+{
+  "configurations" : [
+    {
+      "id" : "8FDB24E6-C66C-49F0-A805-427D507E961E",
+      "name" : "Configuration 1",
+      "options" : {
+
+      }
+    }
+  ],
+  "defaultOptions" : {
+
+  },
+  "testTargets" : [
+    {
+      "target" : {
+        "containerPath" : "container:NordicDFU.xcodeproj",
+        "identifier" : "F09D00312B176A23002F844E",
+        "name" : "NordicDFUTests"
+      }
+    }
+  ],
+  "version" : 1
+}
diff --git a/Package.swift b/Package.swift
@@ -24,19 +24,17 @@ let package = Package(
     .target(
       name: "NordicDFU",
       dependencies: ["ZIPFoundation"],
-      path: "Library/",
-      sources: ["Classes"],
+      path: "Library",
       resources: [
-        .process("Assets/PrivacyInfo.xcprivacy"),
-        .process("Assets/Documentation.docc")
+        .process("Assets/PrivacyInfo.xcprivacy")
       ]
     ),
     // FIXME: Exclude this target for `watchOS` Simulator, because it fails to
     // compile in Xcode.
     .testTarget(
-      name: "Hex2BinConverterTests",
+      name: "NordicDFUTests",
       dependencies: ["NordicDFU"],
-      path: "Test App/Tests/"
+      path: "Tests"
     )
   ],
   swiftLanguageVersions: [.v5]

diff --git a/README.md b/README.md
@@ -42,14 +42,14 @@ pod install
 
 - Create a new **Cartfile** in your project's root with the following contents
 
-```ogld
-github "NordicSemiconductor/IOS-DFU-Library" ~> x.y //Replace x.y with your required version
+```
+github "NordicSemiconductor/IOS-DFU-Library" ~> x.y // Replace x.y with your required version
 ```
 
 - Build with carthage
 
 ```sh
-carthage update --platform iOS //also OSX platform is available for macOS builds
+carthage update --use-xcframeworks --platform iOS // other supported platforms: macOS, tvOS, watchOS
 ```
 
 - Carthage will build the **iOSDFULibrary.framework** and **ZipFramework.framework** files in **Carthage/Build/**, 
@@ -67,7 +67,7 @@ let package = Package(
   dependencies: [
     .package(
       url: "https://github.com/NordicSemiconductor/IOS-DFU-Library", 
-      .upToNextMajor(from: "<Desired Version, e.g. 4.14.0>")
+      .upToNextMajor(from: "<Desired Version>")
     )
   ],
   targets: [.target(name: "<Your Target Name>", dependencies: ["NordicDFU"])]