Skip to content

Commit

Permalink
PVLibrary and PVSupport SwiftPM start
Browse files Browse the repository at this point in the history 
Signed-off-by: Joseph Mattello <[email protected]>
  • Loading branch information
@JoeMatt
JoeMatt committed Jan 16, 2022
1 parent 8d58186 commit a0c94cc
Show file tree
Hide file tree
Showing 91 changed files with 459 additions and 29 deletions.
6 changes: 3 additions & 3 deletions PVLibrary/PVLibrary.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1269,7 +1269,7 @@
children = (
B317380127841959002D3ACD /* Build.xcconfig */,
B3579D112106B11D00DDEBD6 /* PVLibrary */,
B3C04B622107867200E7AF79 /* PVLibraryTests */,
B3C04B622107867200E7AF79 /* Tests */,
B3579D102106B11D00DDEBD6 /* Products */,
B3067F492106B5A20091437F /* Frameworks */,
B305F082276B5152003AE510 /* PVLibrary-tvOS copy-Info.plist */,
Expand Down Expand Up @@ -1876,13 +1876,13 @@
path = iOS;
sourceTree = "<group>";
};
B3C04B622107867200E7AF79 /* PVLibraryTests */ = {
B3C04B622107867200E7AF79 /* Tests */ = {
isa = PBXGroup;
children = (
B3C04B632107867200E7AF79 /* PVLibraryTests.swift */,
B3C04B652107867200E7AF79 /* Info.plist */,
);
path = PVLibraryTests;
path = Tests;
sourceTree = "<group>";
};
/* End PBXGroup section */
Expand Down
88 changes: 88 additions & 0 deletions PVLibrary/Package.resolved
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
{
"object": {
"pins": [
{
"package": "CocoaLumberjack",
"repositoryURL": "https://github.com/CocoaLumberjack/CocoaLumberjack",
"state": {
"branch": null,
"revision": "80ada1f753b0d53d9b57c465936a7c4169375002",
"version": "3.7.4"
}
},
{
"package": "Reachability",
"repositoryURL": "https://github.com/ashleymills/Reachability.swift",
"state": {
"branch": null,
"revision": "c01bbdf2d633cf049ae1ed1a68a2020a8bda32e2",
"version": "5.1.0"
}
},
{
"package": "Realm",
"repositoryURL": "https://github.com/realm/realm-cocoa",
"state": {
"branch": null,
"revision": "39177714b95bb5b1b29fffe28f1c7da77eef8e8b",
"version": "10.21.1"
}
},
{
"package": "RealmDatabase",
"repositoryURL": "https://github.com/realm/realm-core",
"state": {
"branch": null,
"revision": "f1976f0d96d9b06fbe0afbd60090b1c3966b1e23",
"version": "11.8.0"
}
},
{
"package": "RxRealm",
"repositoryURL": "https://github.com/RxSwiftCommunity/RxRealm",
"state": {
"branch": null,
"revision": "d9e612a1bc3788c910b307e49093dec788d102df",
"version": "5.0.3"
}
},
{
"package": "RxSwift",
"repositoryURL": "https://github.com/ReactiveX/RxSwift",
"state": {
"branch": null,
"revision": "b4307ba0b6425c0ba4178e138799946c3da594f8",
"version": "6.5.0"
}
},
{
"package": "SQLite.swift",
"repositoryURL": "https://github.com/stephencelis/SQLite.swift",
"state": {
"branch": null,
"revision": "60a65015f6402b7c34b9a924f755ca0a73afeeaa",
"version": "0.13.1"
}
},
{
"package": "swift-log",
"repositoryURL": "https://github.com/apple/swift-log.git",
"state": {
"branch": null,
"revision": "5d66f7ba25daf4f94100e7022febf3c75e37a6c7",
"version": "1.4.2"
}
},
{
"package": "ZipArchive",
"repositoryURL": "https://github.com/ZipArchive/ZipArchive",
"state": {
"branch": null,
"revision": "825ff12a74a94c54e737e279604c27e6740e8a2c",
"version": "2.4.2"
}
}
]
},
"version": 1
}
127 changes: 127 additions & 0 deletions PVLibrary/Package.swift
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
// swift-tools-version:5.3
// The swift-tools-version declares the minimum version of Swift required to build this package.
import PackageDescription

let package = Package(
name: "PVLibrary",
platforms: [
.iOS(.v11),
.tvOS(.v11),
.watchOS(.v7),
.macOS(.v11)
],
products: [
// Products define the executables and libraries a package produces, and make them visible to other packages.
.library(
name: "PVLibrary",
targets: ["PVLibrary"])
],
dependencies: [
// Dependencies declare other packages that this package depends on.
.package(
name: "PVSupport",
path: "../PVSupport"),
.package(
url: "https://github.com/ReactiveX/RxSwift",
.upToNextMajor(from: "6.2.0")),
.package(
url: "https://github.com/RxSwiftCommunity/RxRealm",
.upToNextMajor(from: "5.0.3")),
.package(
name: "SQLite.swift",
url: "https://github.com/stephencelis/SQLite.swift",
.upToNextMajor(from: "0.12.2")),
.package(
name: "ZipArchive",
url: "https://github.com/ZipArchive/ZipArchive",
.upToNextMajor(from: "2.3.0")),
.package(
name: "Reachability",
url: "https://github.com/realm/realm-cocoa",
.upToNextMajor(from: "10.20.2"))
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
// Targets can depend on other targets in this package, and on products in packages this package depends on.
.target(
name: "PVLibraryObjC",
dependencies: [
"PVSupport",
// "Realm",
// "RealmSwift",
.product(name: "RxCocoa", package: "RxSwift"),
.product(name: "RxSwift", package: "RxSwift"),
.product(name: "RxRealm", package: "RxRealm"),
.product(name: "SQLite", package: "SQLite.swift"),
.product(name: "ZipArchive", package: "ZipArchive")
],
path: "PVLibrary",
sources: [
"Database/OESQLiteDatabase.m",
"NSExtensions/NSFileManager+Hashing.m",
"NSExtensions/UIImage+Scaling.m",
"NSExtensions/NSString+Hashing.m",
"NSExtensions/NSData+Hashing.m",
// "LzmaSDKObjC/src/LzmaSDKObjC.mm",
// "LzmaSDKObjC/src/LzmaSDKObjCBufferProcessor.mm",
// "LzmaSDKObjC/src/LzmaSDKObjCCrc.mm",
// "LzmaSDKObjC/src/LzmaSDKObjCError.mm",
// "LzmaSDKObjC/src/LzmaSDKObjCExtern.mm",
// "LzmaSDKObjC/src/LzmaSDKObjCExtractCallback.mm",
// "LzmaSDKObjC/src/LzmaSDKObjCItem.mm",
// "LzmaSDKObjC/src/LzmaSDKObjCMutableItem.mm",
// "LzmaSDKObjC/src/LzmaSDKObjCReader.mm",
// "LzmaSDKObjC/src/LzmaSDKObjCUpdateCallback.mm",
// "LzmaSDKObjC/src/LzmaSDKObjCWriter.mm",
]),

.target(
name: "LzmaSDKObjC",
path: "LzmaSDKObjC"
),

.target(
name: "PVLibrary",
dependencies: [
"PVSupport",
"LzmaSDKObjC",
"PVLibraryObjC",
// "Realm",
// "RealmSwift",
.product(name: "RxCocoa", package: "RxSwift"),
.product(name: "RxSwift", package: "RxSwift"),
.product(name: "RxRealm", package: "RxRealm"),
.product(name: "SQLite", package: "SQLite.swift"),
.product(name: "ZipArchive", package: "ZipArchive")
],
path: "PVLibrary",
exclude: [
"Database/OESQLiteDatabase.m",
"NSExtensions/NSFileManager+Hashing.m",
"NSExtensions/UIImage+Scaling.m",
"NSExtensions/NSString+Hashing.m",
"NSExtensions/NSData+Hashing.m",
"Info.plist",
// "LzmaSDKObjC/src/LzmaSDKObjC.mm",
// "LzmaSDKObjC/src/LzmaSDKObjCBufferProcessor.mm",
// "LzmaSDKObjC/src/LzmaSDKObjCCrc.mm",
// "LzmaSDKObjC/src/LzmaSDKObjCError.mm",
// "LzmaSDKObjC/src/LzmaSDKObjCExtern.mm",
// "LzmaSDKObjC/src/LzmaSDKObjCExtractCallback.mm",
// "LzmaSDKObjC/src/LzmaSDKObjCItem.mm",
// "LzmaSDKObjC/src/LzmaSDKObjCMutableItem.mm",
// "LzmaSDKObjC/src/LzmaSDKObjCReader.mm",
// "LzmaSDKObjC/src/LzmaSDKObjCUpdateCallback.mm",
// "LzmaSDKObjC/src/LzmaSDKObjCWriter.mm",
],
resources: [
.process("Resources/")
]),

// MARK: SwiftPM tests
.testTarget(
name: "PVLibraryTests",
dependencies: ["PVLibrary"],
path: "Tests")
]
)
0 PVLibrary/PVLibraryTests/Info.plist → PVLibrary/Tests/Info.plist
View file
File renamed without changes.
0 ...brary/PVLibraryTests/PVLibraryTests.swift → PVLibrary/Tests/PVLibraryTests.swift
View file
File renamed without changes.
51 changes: 33 additions & 18 deletions PVSupport/PVSupport.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -379,8 +379,8 @@
isa = PBXGroup;
children = (
B3173802278419A2002D3ACD /* Build.xcconfig */,
B3A4FB58278FE2F200A65248 /* PVSupport */,
B3532B3321A7B736006CDA0F /* PVSupportTests */,
B3A4FB58278FE2F200A65248 /* Sources */,
B3532B3321A7B736006CDA0F /* Tests */,
1ACEA64A17F7467D0031B1C9 /* Supporting Files */,
1ACEA64617F7467D0031B1C9 /* Frameworks */,
1ACEA64517F7467D0031B1C9 /* Products */,
Expand Down Expand Up @@ -419,8 +419,7 @@
B3C96EBA1D62C54D003F1E93 /* Info.plist */,
1ACEA64B17F7467D0031B1C9 /* PVSupport-Prefix.pch */,
);
name = "Supporting Files";
path = PVSupport;
path = "Supporting Files";
sourceTree = "<group>";
};
1ACEA69017F748F80031B1C9 /* Audio */ = {
Expand Down Expand Up @@ -455,6 +454,30 @@
path = Logging;
sourceTree = "<group>";
};
B30E94892793C77700871E57 /* PVSupport */ = {
isa = PBXGroup;
children = (
1ACEA69017F748F80031B1C9 /* Audio */,
B3AB36DC2187F4C4009D9244 /* Controller */,
B3AB37F721882119009D9244 /* CoreOptions */,
1A4E718B1A6C693A005CA80F /* Utilities */,
B3CDEEB821D4C394000C55F7 /* EmulatorCore */,
B302F89420B71C2300C5E502 /* Logging */,
B3A4FB57278FE2B700A65248 /* NSExtensions */,
B3447F99218C1CBE00557ACE /* Settings */,
B3A4FB56278FE2A700A65248 /* Threads */,
);
path = PVSupport;
sourceTree = "<group>";
};
B30E948B2793CBC800871E57 /* PVSupportTests */ = {
isa = PBXGroup;
children = (
B3532B3E21A7B753006CDA0F /* PVSettingsTests.swift */,
);
path = PVSupportTests;
sourceTree = "<group>";
};
B3296E8D26C680EA0088AC32 /* Protocols */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -486,13 +509,13 @@
path = Settings;
sourceTree = "<group>";
};
B3532B3321A7B736006CDA0F /* PVSupportTests */ = {
B3532B3321A7B736006CDA0F /* Tests */ = {
isa = PBXGroup;
children = (
B30E948B2793CBC800871E57 /* PVSupportTests */,
B3532B3621A7B736006CDA0F /* Info.plist */,
B3532B3E21A7B753006CDA0F /* PVSettingsTests.swift */,
);
path = PVSupportTests;
path = Tests;
sourceTree = "<group>";
};
B3A4FB56278FE2A700A65248 /* Threads */ = {
Expand All @@ -516,20 +539,12 @@
path = NSExtensions;
sourceTree = "<group>";
};
B3A4FB58278FE2F200A65248 /* PVSupport */ = {
B3A4FB58278FE2F200A65248 /* Sources */ = {
isa = PBXGroup;
children = (
1ACEA69017F748F80031B1C9 /* Audio */,
B3AB36DC2187F4C4009D9244 /* Controller */,
B3AB37F721882119009D9244 /* CoreOptions */,
1A4E718B1A6C693A005CA80F /* Utilities */,
B3CDEEB821D4C394000C55F7 /* EmulatorCore */,
B302F89420B71C2300C5E502 /* Logging */,
B3A4FB57278FE2B700A65248 /* NSExtensions */,
B3447F99218C1CBE00557ACE /* Settings */,
B3A4FB56278FE2A700A65248 /* Threads */,
B30E94892793C77700871E57 /* PVSupport */,
);
path = PVSupport;
path = Sources;
sourceTree = "<group>";
};
B3AB36DC2187F4C4009D9244 /* Controller */ = {
Expand Down
34 changes: 34 additions & 0 deletions PVSupport/Package.resolved
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"object": {
"pins": [
{
"package": "CocoaLumberjack",
"repositoryURL": "https://github.com/CocoaLumberjack/CocoaLumberjack",
"state": {
"branch": null,
"revision": "80ada1f753b0d53d9b57c465936a7c4169375002",
"version": "3.7.4"
}
},
{
"package": "Reachability",
"repositoryURL": "https://github.com/ashleymills/Reachability.swift",
"state": {
"branch": null,
"revision": "c01bbdf2d633cf049ae1ed1a68a2020a8bda32e2",
"version": "5.1.0"
}
},
{
"package": "swift-log",
"repositoryURL": "https://github.com/apple/swift-log.git",
"state": {
"branch": null,
"revision": "5d66f7ba25daf4f94100e7022febf3c75e37a6c7",
"version": "1.4.2"
}
}
]
},
"version": 1
}
Loading

0 comments on commit a0c94cc

Please sign in to comment.