main Update project structure to avoid locally defined modules

iharkatkavets · Aug 26, 2023 · 7769bd4 · 7769bd4
1 parent 5077873
commit 7769bd4
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 22 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 .DS_Store
+build/
 .build/
 .swiftpm/
 /Packages

diff --git a/Core/Package.swift b/Core/Package.swift
diff --git a/Core/Sources/include/chacha20.c → Core/include/chacha20.c b/Core/Sources/include/chacha20.c → Core/include/chacha20.c
diff --git a/Core/Sources/include/chacha20.h → Core/include/chacha20.h b/Core/Sources/include/chacha20.h → Core/include/chacha20.h
diff --git a/Core/Sources/include/encrypt-portable.h → Core/include/encrypt-portable.h b/Core/Sources/include/encrypt-portable.h → Core/include/encrypt-portable.h
diff --git a/Core/Sources/module.modulemap → Core/include/module.modulemap b/Core/Sources/module.modulemap → Core/include/module.modulemap
diff --git a/Core/Sources/include/salsa20.c → Core/include/salsa20.c b/Core/Sources/include/salsa20.c → Core/include/salsa20.c
diff --git a/Core/Sources/include/salsa20.h → Core/include/salsa20.h b/Core/Sources/include/salsa20.h → Core/include/salsa20.h
diff --git a/Core/Sources/include/twofish.cpp → Core/include/twofish.cpp b/Core/Sources/include/twofish.cpp → Core/include/twofish.cpp
diff --git a/Core/Sources/include/twofish.h → Core/include/twofish.h b/Core/Sources/include/twofish.h → Core/include/twofish.h
diff --git a/Package.swift b/Package.swift
@@ -5,23 +5,19 @@ import PackageDescription
 
 let package = Package(
     name: "StreamKit",
-    platforms: [
-        .macOS(.v12),
-        .iOS(.v13)
-    ],
     products: [
         .library(
             name: "StreamKit",
             targets: ["StreamKit"]),
     ],
-    dependencies: [
-        .package(path: "Core"),
-    ],
     targets: [
         .target(
             name: "StreamKit",
             dependencies: ["Core"],
             path: "Sources"),
+        .target(
+            name: "Core",
+            path: "Core"),
         .testTarget(
             name: "StreamKitTests",
             dependencies: ["StreamKit"],