From 407e33583745f5dcd724dff21bb31f515f466883 Mon Sep 17 00:00:00 2001 From: frizzle Date: Thu, 29 Apr 2021 15:15:09 +0300 Subject: [PATCH 1/7] Added Package.swift configuration --- JKVValue/Public/JKVValueImpl.m | 6 +++++- Package.swift | 39 ++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 Package.swift diff --git a/JKVValue/Public/JKVValueImpl.m b/JKVValue/Public/JKVValueImpl.m index 405f2d1..6498723 100644 --- a/JKVValue/Public/JKVValueImpl.m +++ b/JKVValue/Public/JKVValueImpl.m @@ -1,4 +1,8 @@ -#import "JKVValue.h" +#import "JKVValueImpl.h" +#import "JKVMutableValue.h" +#import "JKVObjectPrinter.h" +#import "JKVFactory.h" + #import "JKVProperty.h" #import "JKVKeyedDecoderVisitor.h" #import "JKVKeyedEncoderVisitor.h" diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..a17a430 --- /dev/null +++ b/Package.swift @@ -0,0 +1,39 @@ +// swift-tools-version:5.1 + +import PackageDescription + +let package = Package( + name: "JKVValue", + platforms: [.iOS(.v9), .macOS(.v10_10), .tvOS(.v9)], + products: [ + .library( + name: "JKVValue", + targets: ["JKVValue"]) + ], + targets: [ + .target( + name: "JKVValue", +// dependencies: [ +// .target(name: "JKVValuePrivate") +// ], + path: "JKVValue", +// exclude: ["JKVValue.h"], + sources:["Public", "Private"], +// sources: ["JKVValue/Public/JKVValue.h", +// "JKVValue/Public/JKVFactory.h", +// "JKVValue/Public/JKVMutableValue.h", +// "JKVValue/Public/JKVObjectPrinter.h", +// "JKVValue/Public/JKVValueImpl.h", +// "JKVValue/Private/JKVClassInspector.h", +// "JKVValue/Private/JKVKeyedDecoderVisitor.h", +// "JKVValue/Private/JKVKeyedEncoderVisitor.h", +// "JKVValue/Private/JKVNonZeroSetterVisitor.h", +// "JKVValue/Private/JKVObjectPrinter-Protected.h", +// "JKVValue/Private/JKVProperty.h"], + publicHeadersPath: "Public", + cSettings: [ + .headerSearchPath("Public"), + .headerSearchPath("Private") + ]) + ] +) From fe9f26028c24da527a6db24996a0d64e065d89ee Mon Sep 17 00:00:00 2001 From: frizzle Date: Thu, 29 Apr 2021 15:36:45 +0300 Subject: [PATCH 2/7] Updated package --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index a17a430..da79b54 100644 --- a/Package.swift +++ b/Package.swift @@ -17,7 +17,7 @@ let package = Package( // .target(name: "JKVValuePrivate") // ], path: "JKVValue", -// exclude: ["JKVValue.h"], + exclude: ["JKVValue.h", "Public/JKVValue.h"], sources:["Public", "Private"], // sources: ["JKVValue/Public/JKVValue.h", // "JKVValue/Public/JKVFactory.h", From 6660e05aef2cdb25128394f18ed4ea757d69f2a3 Mon Sep 17 00:00:00 2001 From: frizzle Date: Thu, 29 Apr 2021 15:52:27 +0300 Subject: [PATCH 3/7] Updated package --- Package.swift | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/Package.swift b/Package.swift index da79b54..f024f65 100644 --- a/Package.swift +++ b/Package.swift @@ -18,21 +18,20 @@ let package = Package( // ], path: "JKVValue", exclude: ["JKVValue.h", "Public/JKVValue.h"], - sources:["Public", "Private"], -// sources: ["JKVValue/Public/JKVValue.h", -// "JKVValue/Public/JKVFactory.h", -// "JKVValue/Public/JKVMutableValue.h", -// "JKVValue/Public/JKVObjectPrinter.h", -// "JKVValue/Public/JKVValueImpl.h", -// "JKVValue/Private/JKVClassInspector.h", -// "JKVValue/Private/JKVKeyedDecoderVisitor.h", -// "JKVValue/Private/JKVKeyedEncoderVisitor.h", -// "JKVValue/Private/JKVNonZeroSetterVisitor.h", -// "JKVValue/Private/JKVObjectPrinter-Protected.h", -// "JKVValue/Private/JKVProperty.h"], +// sources:["Public", "Private"], +// sources: ["Public/JKVFactory.h", +// "Public/JKVMutableValue.h", +// "Public/JKVObjectPrinter.h", +// "Public/JKVValueImpl.h", +// "Private/JKVClassInspector.h", +// "Private/JKVKeyedDecoderVisitor.h", +// "Private/JKVKeyedEncoderVisitor.h", +// "Private/JKVNonZeroSetterVisitor.h", +// "Private/JKVObjectPrinter-Protected.h", +// "Private/JKVProperty.h"], publicHeadersPath: "Public", cSettings: [ - .headerSearchPath("Public"), +// .headerSearchPath("Public"), .headerSearchPath("Private") ]) ] From d93db415ca06839121dcb2990b9344a40ece33ff Mon Sep 17 00:00:00 2001 From: frizzle Date: Thu, 29 Apr 2021 15:54:32 +0300 Subject: [PATCH 4/7] Test --- Package.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Package.swift b/Package.swift index f024f65..3c30426 100644 --- a/Package.swift +++ b/Package.swift @@ -3,11 +3,11 @@ import PackageDescription let package = Package( - name: "JKVValue", + name: "JKVValueLib", platforms: [.iOS(.v9), .macOS(.v10_10), .tvOS(.v9)], products: [ .library( - name: "JKVValue", + name: "JKVValueLib", targets: ["JKVValue"]) ], targets: [ From 13b2fe940893188827fb24cccc8cee584b994d36 Mon Sep 17 00:00:00 2001 From: frizzle Date: Thu, 29 Apr 2021 17:01:18 +0300 Subject: [PATCH 5/7] Update sources structure --- JKVValue/{Public => }/JKVValue.h | 0 JKVValue/{ => Source}/Private/JKVClassInspector.h | 0 JKVValue/{ => Source}/Private/JKVClassInspector.m | 0 .../{ => Source}/Private/JKVKeyedDecoderVisitor.h | 0 .../{ => Source}/Private/JKVKeyedDecoderVisitor.m | 0 .../{ => Source}/Private/JKVKeyedEncoderVisitor.h | 0 .../{ => Source}/Private/JKVKeyedEncoderVisitor.m | 0 .../{ => Source}/Private/JKVNonZeroSetterVisitor.h | 0 .../{ => Source}/Private/JKVNonZeroSetterVisitor.m | 0 .../Private/JKVObjectPrinter-Protected.h | 0 JKVValue/{ => Source}/Private/JKVProperty.h | 0 JKVValue/{ => Source}/Private/JKVProperty.m | 0 JKVValue/{ => Source}/Public/JKVFactory.h | 0 JKVValue/{ => Source}/Public/JKVFactory.m | 0 JKVValue/{ => Source}/Public/JKVMutableValue.h | 0 JKVValue/{ => Source}/Public/JKVMutableValue.m | 0 JKVValue/{ => Source}/Public/JKVObjectPrinter.h | 0 JKVValue/{ => Source}/Public/JKVObjectPrinter.m | 0 JKVValue/{ => Source}/Public/JKVValueImpl.h | 0 JKVValue/{ => Source}/Public/JKVValueImpl.m | 0 Package.swift | 13 +++++++------ 21 files changed, 7 insertions(+), 6 deletions(-) rename JKVValue/{Public => }/JKVValue.h (100%) rename JKVValue/{ => Source}/Private/JKVClassInspector.h (100%) rename JKVValue/{ => Source}/Private/JKVClassInspector.m (100%) rename JKVValue/{ => Source}/Private/JKVKeyedDecoderVisitor.h (100%) rename JKVValue/{ => Source}/Private/JKVKeyedDecoderVisitor.m (100%) rename JKVValue/{ => Source}/Private/JKVKeyedEncoderVisitor.h (100%) rename JKVValue/{ => Source}/Private/JKVKeyedEncoderVisitor.m (100%) rename JKVValue/{ => Source}/Private/JKVNonZeroSetterVisitor.h (100%) rename JKVValue/{ => Source}/Private/JKVNonZeroSetterVisitor.m (100%) rename JKVValue/{ => Source}/Private/JKVObjectPrinter-Protected.h (100%) rename JKVValue/{ => Source}/Private/JKVProperty.h (100%) rename JKVValue/{ => Source}/Private/JKVProperty.m (100%) rename JKVValue/{ => Source}/Public/JKVFactory.h (100%) rename JKVValue/{ => Source}/Public/JKVFactory.m (100%) rename JKVValue/{ => Source}/Public/JKVMutableValue.h (100%) rename JKVValue/{ => Source}/Public/JKVMutableValue.m (100%) rename JKVValue/{ => Source}/Public/JKVObjectPrinter.h (100%) rename JKVValue/{ => Source}/Public/JKVObjectPrinter.m (100%) rename JKVValue/{ => Source}/Public/JKVValueImpl.h (100%) rename JKVValue/{ => Source}/Public/JKVValueImpl.m (100%) diff --git a/JKVValue/Public/JKVValue.h b/JKVValue/JKVValue.h similarity index 100% rename from JKVValue/Public/JKVValue.h rename to JKVValue/JKVValue.h diff --git a/JKVValue/Private/JKVClassInspector.h b/JKVValue/Source/Private/JKVClassInspector.h similarity index 100% rename from JKVValue/Private/JKVClassInspector.h rename to JKVValue/Source/Private/JKVClassInspector.h diff --git a/JKVValue/Private/JKVClassInspector.m b/JKVValue/Source/Private/JKVClassInspector.m similarity index 100% rename from JKVValue/Private/JKVClassInspector.m rename to JKVValue/Source/Private/JKVClassInspector.m diff --git a/JKVValue/Private/JKVKeyedDecoderVisitor.h b/JKVValue/Source/Private/JKVKeyedDecoderVisitor.h similarity index 100% rename from JKVValue/Private/JKVKeyedDecoderVisitor.h rename to JKVValue/Source/Private/JKVKeyedDecoderVisitor.h diff --git a/JKVValue/Private/JKVKeyedDecoderVisitor.m b/JKVValue/Source/Private/JKVKeyedDecoderVisitor.m similarity index 100% rename from JKVValue/Private/JKVKeyedDecoderVisitor.m rename to JKVValue/Source/Private/JKVKeyedDecoderVisitor.m diff --git a/JKVValue/Private/JKVKeyedEncoderVisitor.h b/JKVValue/Source/Private/JKVKeyedEncoderVisitor.h similarity index 100% rename from JKVValue/Private/JKVKeyedEncoderVisitor.h rename to JKVValue/Source/Private/JKVKeyedEncoderVisitor.h diff --git a/JKVValue/Private/JKVKeyedEncoderVisitor.m b/JKVValue/Source/Private/JKVKeyedEncoderVisitor.m similarity index 100% rename from JKVValue/Private/JKVKeyedEncoderVisitor.m rename to JKVValue/Source/Private/JKVKeyedEncoderVisitor.m diff --git a/JKVValue/Private/JKVNonZeroSetterVisitor.h b/JKVValue/Source/Private/JKVNonZeroSetterVisitor.h similarity index 100% rename from JKVValue/Private/JKVNonZeroSetterVisitor.h rename to JKVValue/Source/Private/JKVNonZeroSetterVisitor.h diff --git a/JKVValue/Private/JKVNonZeroSetterVisitor.m b/JKVValue/Source/Private/JKVNonZeroSetterVisitor.m similarity index 100% rename from JKVValue/Private/JKVNonZeroSetterVisitor.m rename to JKVValue/Source/Private/JKVNonZeroSetterVisitor.m diff --git a/JKVValue/Private/JKVObjectPrinter-Protected.h b/JKVValue/Source/Private/JKVObjectPrinter-Protected.h similarity index 100% rename from JKVValue/Private/JKVObjectPrinter-Protected.h rename to JKVValue/Source/Private/JKVObjectPrinter-Protected.h diff --git a/JKVValue/Private/JKVProperty.h b/JKVValue/Source/Private/JKVProperty.h similarity index 100% rename from JKVValue/Private/JKVProperty.h rename to JKVValue/Source/Private/JKVProperty.h diff --git a/JKVValue/Private/JKVProperty.m b/JKVValue/Source/Private/JKVProperty.m similarity index 100% rename from JKVValue/Private/JKVProperty.m rename to JKVValue/Source/Private/JKVProperty.m diff --git a/JKVValue/Public/JKVFactory.h b/JKVValue/Source/Public/JKVFactory.h similarity index 100% rename from JKVValue/Public/JKVFactory.h rename to JKVValue/Source/Public/JKVFactory.h diff --git a/JKVValue/Public/JKVFactory.m b/JKVValue/Source/Public/JKVFactory.m similarity index 100% rename from JKVValue/Public/JKVFactory.m rename to JKVValue/Source/Public/JKVFactory.m diff --git a/JKVValue/Public/JKVMutableValue.h b/JKVValue/Source/Public/JKVMutableValue.h similarity index 100% rename from JKVValue/Public/JKVMutableValue.h rename to JKVValue/Source/Public/JKVMutableValue.h diff --git a/JKVValue/Public/JKVMutableValue.m b/JKVValue/Source/Public/JKVMutableValue.m similarity index 100% rename from JKVValue/Public/JKVMutableValue.m rename to JKVValue/Source/Public/JKVMutableValue.m diff --git a/JKVValue/Public/JKVObjectPrinter.h b/JKVValue/Source/Public/JKVObjectPrinter.h similarity index 100% rename from JKVValue/Public/JKVObjectPrinter.h rename to JKVValue/Source/Public/JKVObjectPrinter.h diff --git a/JKVValue/Public/JKVObjectPrinter.m b/JKVValue/Source/Public/JKVObjectPrinter.m similarity index 100% rename from JKVValue/Public/JKVObjectPrinter.m rename to JKVValue/Source/Public/JKVObjectPrinter.m diff --git a/JKVValue/Public/JKVValueImpl.h b/JKVValue/Source/Public/JKVValueImpl.h similarity index 100% rename from JKVValue/Public/JKVValueImpl.h rename to JKVValue/Source/Public/JKVValueImpl.h diff --git a/JKVValue/Public/JKVValueImpl.m b/JKVValue/Source/Public/JKVValueImpl.m similarity index 100% rename from JKVValue/Public/JKVValueImpl.m rename to JKVValue/Source/Public/JKVValueImpl.m diff --git a/Package.swift b/Package.swift index 3c30426..6fff71c 100644 --- a/Package.swift +++ b/Package.swift @@ -3,11 +3,11 @@ import PackageDescription let package = Package( - name: "JKVValueLib", + name: "JKVValue", platforms: [.iOS(.v9), .macOS(.v10_10), .tvOS(.v9)], products: [ .library( - name: "JKVValueLib", + name: "JKVValue", targets: ["JKVValue"]) ], targets: [ @@ -16,8 +16,8 @@ let package = Package( // dependencies: [ // .target(name: "JKVValuePrivate") // ], - path: "JKVValue", - exclude: ["JKVValue.h", "Public/JKVValue.h"], + path: "JKVValue/Source", +// exclude: ["JKVValue.h", "Public/JKVValue.h"], // sources:["Public", "Private"], // sources: ["Public/JKVFactory.h", // "Public/JKVMutableValue.h", @@ -31,8 +31,9 @@ let package = Package( // "Private/JKVProperty.h"], publicHeadersPath: "Public", cSettings: [ -// .headerSearchPath("Public"), + .headerSearchPath("Public"), .headerSearchPath("Private") - ]) + ] + ) ] ) From 8f42b76de1dcbdab45bd51cd09dc9b3378940b9d Mon Sep 17 00:00:00 2001 From: frizzle Date: Thu, 29 Apr 2021 17:14:26 +0300 Subject: [PATCH 6/7] Replaced JKVValue.h --- JKVValue/{ => Source}/JKVValue.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename JKVValue/{ => Source}/JKVValue.h (100%) diff --git a/JKVValue/JKVValue.h b/JKVValue/Source/JKVValue.h similarity index 100% rename from JKVValue/JKVValue.h rename to JKVValue/Source/JKVValue.h From 4dcbf96b145c8e92ecc4d4d0c12028fe790213bf Mon Sep 17 00:00:00 2001 From: frizzle Date: Thu, 29 Apr 2021 17:58:06 +0300 Subject: [PATCH 7/7] Updated .podspec file --- JKVValue.podspec | 4 ++-- Package.swift | 15 --------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/JKVValue.podspec b/JKVValue.podspec index ab158ea..7821237 100644 --- a/JKVValue.podspec +++ b/JKVValue.podspec @@ -32,7 +32,7 @@ Pod::Spec.new do |s| s.ios.deployment_target = '6.0' s.osx.deployment_target = '10.8' s.source = { :git => "https://github.com/jeffh/JKVValue.git", :tag => "v#{s.version}" } - s.source_files = 'JKVValue/**/*.{h,m}' - s.public_header_files = 'JKVValue/Public/**/*.h' + s.source_files = 'JKVValue/Source/**/*.{h,m}' + s.public_header_files = 'JKVValue/Source/Public/**/*.h' s.requires_arc = true end diff --git a/Package.swift b/Package.swift index 6fff71c..0a0b8a0 100644 --- a/Package.swift +++ b/Package.swift @@ -13,22 +13,7 @@ let package = Package( targets: [ .target( name: "JKVValue", -// dependencies: [ -// .target(name: "JKVValuePrivate") -// ], path: "JKVValue/Source", -// exclude: ["JKVValue.h", "Public/JKVValue.h"], -// sources:["Public", "Private"], -// sources: ["Public/JKVFactory.h", -// "Public/JKVMutableValue.h", -// "Public/JKVObjectPrinter.h", -// "Public/JKVValueImpl.h", -// "Private/JKVClassInspector.h", -// "Private/JKVKeyedDecoderVisitor.h", -// "Private/JKVKeyedEncoderVisitor.h", -// "Private/JKVNonZeroSetterVisitor.h", -// "Private/JKVObjectPrinter-Protected.h", -// "Private/JKVProperty.h"], publicHeadersPath: "Public", cSettings: [ .headerSearchPath("Public"),