From 2e6017a6fbfef8ae6be0a4f4dd44e02ef23e9cd3 Mon Sep 17 00:00:00 2001 From: Paul Schmiedmayer Date: Fri, 12 May 2023 01:24:07 -0700 Subject: [PATCH] Updates the Project to be Part of the Spezi Organization (#6) --- .github/workflows/build-and-test.yml | 14 ++--- .github/workflows/pull_request.yml | 6 +- .gitignore | 2 +- .spi.yml | 4 +- .swiftlint.yml | 2 +- CITATION.cff | 6 +- CONTRIBUTORS.md | 18 +++--- Package.swift | 16 +++--- README.md | 26 ++++----- .../Event.swift | 2 +- .../EventContext.swift | 2 +- .../Lock.swift | 2 +- .../Schedule.swift | 2 +- .../Scheduler.swift | 4 +- .../SpeziScheduler.docc}/SchedulingATask.md | 2 +- .../SpeziScheduler.docc/SpeziScheduler.md} | 4 +- .../Task.swift | 2 +- .../SchedulerTests.swift | 6 +- Tests/UITests/TestApp.xctestplan.license | 2 +- .../Contents.json.license | 2 +- .../AppIcon.appiconset/Contents.json.license | 2 +- .../Assets.xcassets/Contents.json.license | 2 +- Tests/UITests/TestApp/ContentView.swift | 4 +- Tests/UITests/TestApp/TestApp.swift | 6 +- Tests/UITests/TestApp/TestAppDelegate.swift | 8 +-- Tests/UITests/TestApp/TestAppStandard.swift | 4 +- .../TestAppUITests/TestAppUITests.swift | 4 +- .../UITests/UITests.xcodeproj/project.pbxproj | 56 +++++++++---------- .../UITests.xcodeproj/project.pbxproj.license | 2 +- .../contents.xcworkspacedata.license | 2 +- .../IDEWorkspaceChecks.plist.license | 2 +- .../xcshareddata/xcschemes/TestApp.xcscheme | 6 +- .../xcschemes/TestApp.xcscheme.license | 2 +- 33 files changed, 111 insertions(+), 113 deletions(-) rename Sources/{CardinalKitScheduler => SpeziScheduler}/Event.swift (97%) rename Sources/{CardinalKitScheduler => SpeziScheduler}/EventContext.swift (81%) rename Sources/{CardinalKitScheduler => SpeziScheduler}/Lock.swift (82%) rename Sources/{CardinalKitScheduler => SpeziScheduler}/Schedule.swift (98%) rename Sources/{CardinalKitScheduler => SpeziScheduler}/Scheduler.swift (97%) rename Sources/{CardinalKitScheduler/CardinalKitScheduler.docc => SpeziScheduler/SpeziScheduler.docc}/SchedulingATask.md (93%) rename Sources/{CardinalKitScheduler/CardinalKitScheduler.docc/CardinalKitScheduler.md => SpeziScheduler/SpeziScheduler.docc/SpeziScheduler.md} (87%) rename Sources/{CardinalKitScheduler => SpeziScheduler}/Task.swift (98%) rename Tests/{CardinalKitSchedulerTests => SpeziSchedulerTests}/SchedulerTests.swift (98%) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index abd7f86..bf6be4b 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -1,5 +1,5 @@ # -# This source file is part of the CardinalKit open source project +# This source file is part of the Spezi open source project # # SPDX-FileCopyrightText: 2022 Stanford University and the project authors (see CONTRIBUTORS.md) # @@ -18,14 +18,14 @@ on: jobs: buildandtest: name: Build and Test Swift Package - uses: StanfordBDHG/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2 + uses: StanfordSpezi/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2 with: - artifactname: CardinalKitScheduler.xcresult + artifactname: SpeziScheduler.xcresult runsonlabels: '["macOS", "self-hosted"]' - scheme: CardinalKitScheduler + scheme: SpeziScheduler buildandtestuitests: name: Build and Test UI Tests - uses: StanfordBDHG/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2 + uses: StanfordSpezi/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2 with: artifactname: TestApp.xcresult runsonlabels: '["macOS", "self-hosted"]' @@ -34,6 +34,6 @@ jobs: uploadcoveragereport: name: Upload Coverage Report needs: [buildandtest, buildandtestuitests] - uses: StanfordBDHG/.github/.github/workflows/create-and-upload-coverage-report.yml@v2 + uses: StanfordSpezi/.github/.github/workflows/create-and-upload-coverage-report.yml@v2 with: - coveragereports: CardinalKitScheduler.xcresult TestApp.xcresult + coveragereports: SpeziScheduler.xcresult TestApp.xcresult diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 9386a12..d01b888 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -1,5 +1,5 @@ # -# This source file is part of the CardinalKit open source project +# This source file is part of the Spezi open source project # # SPDX-FileCopyrightText: 2022 Stanford University and the project authors (see CONTRIBUTORS.md) # @@ -15,7 +15,7 @@ on: jobs: reuse_action: name: REUSE Compliance Check - uses: StanfordBDHG/.github/.github/workflows/reuse.yml@v2 + uses: StanfordSpezi/.github/.github/workflows/reuse.yml@v2 swiftlint: name: SwiftLint - uses: StanfordBDHG/.github/.github/workflows/swiftlint.yml@v2 + uses: StanfordSpezi/.github/.github/workflows/swiftlint.yml@v2 diff --git a/.gitignore b/.gitignore index 96f9e72..bcbd16f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ # -# This source file is part of the CardinalKit open source project +# This source file is part of the Spezi open source project # # SPDX-FileCopyrightText: 2022 Stanford University and the project authors (see CONTRIBUTORS.md) # diff --git a/.spi.yml b/.spi.yml index bf695fc..215fd1f 100644 --- a/.spi.yml +++ b/.spi.yml @@ -1,5 +1,5 @@ # -# This source file is part of the CardinalKit open source project +# This source file is part of the Spezi open source project # # SPDX-FileCopyrightText: 2022 Stanford University and the project authors (see CONTRIBUTORS.md) # @@ -11,4 +11,4 @@ builder: configs: - platform: ios documentation_targets: - - CardinalKitScheduler + - SpeziScheduler diff --git a/.swiftlint.yml b/.swiftlint.yml index 4e9c9fe..a139069 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -1,5 +1,5 @@ # -# This source file is part of the CardinalKit open source project +# This source file is part of the Spezi open source project # # SPDX-FileCopyrightText: 2022 Stanford University and the project authors (see CONTRIBUTORS.md) # diff --git a/CITATION.cff b/CITATION.cff index c5e06d6..e14af74 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -1,5 +1,5 @@ # -# This source file is part of the CardinalKit open source project +# This source file is part of the Spezi open source project # # SPDX-FileCopyrightText: 2022 Stanford University and the project authors (see CONTRIBUTORS.md) # @@ -18,6 +18,6 @@ authors: - family-names: "Aalami" given-names: "Oliver" orcid: "https://orcid.org/0000-0002-7799-2429" -title: "CardinalKit" +title: "Spezi" doi: 10.5281/zenodo.7706954 -url: "https://github.com/StanfordBDHG/CardinalKitScheduler" +url: "https://github.com/StanfordSpezi/SpeziScheduler" diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index c92e3c2..6411feb 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1,16 +1,14 @@ -CardinalKit Scheduler contributors +Spezi Scheduler contributors ==================== * [Paul Schmiedmayer](https://github.com/PSchmiedmayer) diff --git a/Package.swift b/Package.swift index 910bd1e..e7c408c 100644 --- a/Package.swift +++ b/Package.swift @@ -1,7 +1,7 @@ // swift-tools-version:5.7 // -// This source file is part of the CardinalKit open source project +// This source file is part of the Spezi open source project // // SPDX-FileCopyrightText: 2022 Stanford University and the project authors (see CONTRIBUTORS.md) // @@ -12,27 +12,27 @@ import PackageDescription let package = Package( - name: "CardinalKitScheduler", + name: "SpeziScheduler", platforms: [ .iOS(.v16) ], products: [ - .library(name: "CardinalKitScheduler", targets: ["CardinalKitScheduler"]) + .library(name: "SpeziScheduler", targets: ["SpeziScheduler"]) ], dependencies: [ - .package(url: "https://github.com/StanfordBDHG/CardinalKit", .upToNextMinor(from: "0.4.1")) + .package(url: "https://github.com/StanfordSpezi/Spezi", .upToNextMinor(from: "0.5.0")) ], targets: [ .target( - name: "CardinalKitScheduler", + name: "SpeziScheduler", dependencies: [ - .product(name: "CardinalKit", package: "CardinalKit") + .product(name: "Spezi", package: "Spezi") ] ), .testTarget( - name: "CardinalKitSchedulerTests", + name: "SpeziSchedulerTests", dependencies: [ - .target(name: "CardinalKitScheduler") + .target(name: "SpeziScheduler") ] ) ] diff --git a/README.md b/README.md index 272daf5..d901450 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# CardinalKit Scheduler +# Spezi Scheduler -[![Build and Test](https://github.com/StanfordBDHG/CardinalKitScheduler/actions/workflows/build-and-test.yml/badge.svg)](https://github.com/StanfordBDHG/CardinalKitScheduler/actions/workflows/build-and-test.yml) -[![codecov](https://codecov.io/gh/StanfordBDHG/CardinalKitScheduler/branch/main/graph/badge.svg?token=0SRI67ItFw)](https://codecov.io/gh/StanfordBDHG/CardinalKitScheduler) +[![Build and Test](https://github.com/StanfordSpezi/SpeziScheduler/actions/workflows/build-and-test.yml/badge.svg)](https://github.com/StanfordSpezi/SpeziScheduler/actions/workflows/build-and-test.yml) +[![codecov](https://codecov.io/gh/StanfordSpezi/SpeziScheduler/branch/main/graph/badge.svg?token=0SRI67ItFw)](https://codecov.io/gh/StanfordSpezi/SpeziScheduler) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.7706954.svg)](https://doi.org/10.5281/zenodo.7706954) -[![](https://img.shields.io/endpoint?url=https%3A%2F%2Fswiftpackageindex.com%2Fapi%2Fpackages%2FStanfordBDHG%2FCardinalKitScheduler%2Fbadge%3Ftype%3Dswift-versions)](https://swiftpackageindex.com/StanfordBDHG/CardinalKitScheduler) -[![](https://img.shields.io/endpoint?url=https%3A%2F%2Fswiftpackageindex.com%2Fapi%2Fpackages%2FStanfordBDHG%2FCardinalKitScheduler%2Fbadge%3Ftype%3Dplatforms)](https://swiftpackageindex.com/StanfordBDHG/CardinalKitScheduler) +[![](https://img.shields.io/endpoint?url=https%3A%2F%2Fswiftpackageindex.com%2Fapi%2Fpackages%2FStanfordSpezi%2FSpeziScheduler%2Fbadge%3Ftype%3Dswift-versions)](https://swiftpackageindex.com/StanfordSpezi/SpeziScheduler) +[![](https://img.shields.io/endpoint?url=https%3A%2F%2Fswiftpackageindex.com%2Fapi%2Fpackages%2FStanfordSpezi%2FSpeziScheduler%2Fbadge%3Ftype%3Dplatforms)](https://swiftpackageindex.com/StanfordSpezi/SpeziScheduler) The Scheduler module allows developers to schedule tasks based on predefined schedules. -For more information, please refer to the [API documentation](https://swiftpackageindex.com/StanfordBDHG/CardinalKitScheduler/documentation). +For more information, please refer to the [API documentation](https://swiftpackageindex.com/StanfordSpezi/SpeziScheduler/documentation). -## The CardinalKit Template Application +## The Spezi Template Application -The [CardinalKit Template Application](https://github.com/StanfordBDHG/CardinalKitTemplateApplication) provides a great starting point and example using the CardinalKit Scheduler module. +The [Spezi Template Application](https://github.com/StanfordSpezi/SpeziTemplateApplication) provides a great starting point and example using the Spezi Scheduler module. ## Contributing -Contributions to this project are welcome. Please make sure to read the [contribution guidelines](https://github.com/StanfordBDHG/.github/blob/main/CONTRIBUTING.md) and the [contributor covenant code of conduct](https://github.com/StanfordBDHG/.github/blob/main/CODE_OF_CONDUCT.md) first. +Contributions to this project are welcome. Please make sure to read the [contribution guidelines](https://github.com/StanfordSpezi/.github/blob/main/CONTRIBUTING.md) and the [contributor covenant code of conduct](https://github.com/StanfordSpezi/.github/blob/main/CODE_OF_CONDUCT.md) first. ## License -This project is licensed under the MIT License. See [Licenses](https://github.com/StanfordBDHG/CardinalKitScheduler/tree/main/LICENSES) for more information. +This project is licensed under the MIT License. See [Licenses](https://github.com/StanfordSpezi/SpeziScheduler/tree/main/LICENSES) for more information. -![Stanford Byers Center for Biodesign Logo](https://raw.githubusercontent.com/StanfordBDHG/.github/main/assets/biodesign-footer-light.png#gh-light-mode-only) -![Stanford Byers Center for Biodesign Logo](https://raw.githubusercontent.com/StanfordBDHG/.github/main/assets/biodesign-footer-dark.png#gh-dark-mode-only) +![Spezi Footer](https://raw.githubusercontent.com/StanfordSpezi/.github/main/assets/FooterLight.png#gh-light-mode-only) +![Spezi Footer](https://raw.githubusercontent.com/StanfordSpezi/.github/main/assets/FooterDark.png#gh-dark-mode-only) diff --git a/Sources/CardinalKitScheduler/Event.swift b/Sources/SpeziScheduler/Event.swift similarity index 97% rename from Sources/CardinalKitScheduler/Event.swift rename to Sources/SpeziScheduler/Event.swift index 21e5c4d..76b3ca8 100644 --- a/Sources/CardinalKitScheduler/Event.swift +++ b/Sources/SpeziScheduler/Event.swift @@ -1,5 +1,5 @@ // -// This source file is part of the CardinalKit open-source project +// This source file is part of the Stanford Spezi open-source project // // SPDX-FileCopyrightText: 2022 Stanford University and the project authors (see CONTRIBUTORS.md) // diff --git a/Sources/CardinalKitScheduler/EventContext.swift b/Sources/SpeziScheduler/EventContext.swift similarity index 81% rename from Sources/CardinalKitScheduler/EventContext.swift rename to Sources/SpeziScheduler/EventContext.swift index 5362f9d..839f7b0 100644 --- a/Sources/CardinalKitScheduler/EventContext.swift +++ b/Sources/SpeziScheduler/EventContext.swift @@ -1,5 +1,5 @@ // -// This source file is part of the CardinalKit open-source project +// This source file is part of the Stanford Spezi open-source project // // SPDX-FileCopyrightText: 2022 Stanford University and the project authors (see CONTRIBUTORS.md) // diff --git a/Sources/CardinalKitScheduler/Lock.swift b/Sources/SpeziScheduler/Lock.swift similarity index 82% rename from Sources/CardinalKitScheduler/Lock.swift rename to Sources/SpeziScheduler/Lock.swift index 0b51cca..3a30e4f 100644 --- a/Sources/CardinalKitScheduler/Lock.swift +++ b/Sources/SpeziScheduler/Lock.swift @@ -1,5 +1,5 @@ // -// This source file is part of the CardinalKit open-source project +// This source file is part of the Stanford Spezi open-source project // // SPDX-FileCopyrightText: 2022 Stanford University and the project authors (see CONTRIBUTORS.md) // diff --git a/Sources/CardinalKitScheduler/Schedule.swift b/Sources/SpeziScheduler/Schedule.swift similarity index 98% rename from Sources/CardinalKitScheduler/Schedule.swift rename to Sources/SpeziScheduler/Schedule.swift index 89d0726..093cfa2 100644 --- a/Sources/CardinalKitScheduler/Schedule.swift +++ b/Sources/SpeziScheduler/Schedule.swift @@ -1,5 +1,5 @@ // -// This source file is part of the CardinalKit open-source project +// This source file is part of the Stanford Spezi open-source project // // SPDX-FileCopyrightText: 2022 Stanford University and the project authors (see CONTRIBUTORS.md) // diff --git a/Sources/CardinalKitScheduler/Scheduler.swift b/Sources/SpeziScheduler/Scheduler.swift similarity index 97% rename from Sources/CardinalKitScheduler/Scheduler.swift rename to Sources/SpeziScheduler/Scheduler.swift index 98984fe..9dfe485 100644 --- a/Sources/CardinalKitScheduler/Scheduler.swift +++ b/Sources/SpeziScheduler/Scheduler.swift @@ -1,14 +1,14 @@ // -// This source file is part of the CardinalKit open-source project +// This source file is part of the Stanford Spezi open-source project // // SPDX-FileCopyrightText: 2022 Stanford University and the project authors (see CONTRIBUTORS.md) // // SPDX-License-Identifier: MIT // -import CardinalKit import Combine import Foundation +import Spezi /// The ``Scheduler/Scheduler`` module allows the scheduling and observation of ``Task``s adhering to a specific ``Schedule``. diff --git a/Sources/CardinalKitScheduler/CardinalKitScheduler.docc/SchedulingATask.md b/Sources/SpeziScheduler/SpeziScheduler.docc/SchedulingATask.md similarity index 93% rename from Sources/CardinalKitScheduler/CardinalKitScheduler.docc/SchedulingATask.md rename to Sources/SpeziScheduler/SpeziScheduler.docc/SchedulingATask.md index 3b89c3a..b832b05 100644 --- a/Sources/CardinalKitScheduler/CardinalKitScheduler.docc/SchedulingATask.md +++ b/Sources/SpeziScheduler/SpeziScheduler.docc/SchedulingATask.md @@ -2,7 +2,7 @@