From 6ffb351d94359edabc61986fecc3258eead29314 Mon Sep 17 00:00:00 2001 From: Rakuyo Date: Sat, 2 Apr 2022 09:53:35 +0800 Subject: [PATCH 1/2] Fix the problem of SPM path error --- .../xcode/package.xcworkspace/contents.xcworkspacedata | 7 +++++++ Package.swift | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..919434a --- /dev/null +++ b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/Package.swift b/Package.swift index d40528a..754eed1 100644 --- a/Package.swift +++ b/Package.swift @@ -10,7 +10,7 @@ let package = Package( targets: [ .target( name: "JSONPreview", - path: "JSONPreview/JSONPreview", + path: "JSONPreview", exclude: [ "Other/AppDelegate.swift", "Other/ViewController.swift", From 27d9564046dec50cb3acec35cf3f8cb5ea719139 Mon Sep 17 00:00:00 2001 From: Rakuyo Date: Sat, 2 Apr 2022 09:55:07 +0800 Subject: [PATCH 2/2] [Release] version: 1.3.5 build: 13 --- JSONPreview.podspec | 2 +- JSONPreview.xcodeproj/project.pbxproj | 8 ++++---- JSONPreview/Other/Info.plist | 2 +- JSONPreviewTests/Info.plist | 4 ++-- JSONPreviewUITests/Info.plist | 4 ++-- README.md | 4 ++-- README_CN.md | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/JSONPreview.podspec b/JSONPreview.podspec index 8e3e112..64b9685 100755 --- a/JSONPreview.podspec +++ b/JSONPreview.podspec @@ -5,7 +5,7 @@ Pod::Spec.new do |s| s.name = 'JSONPreview' - s.version = '1.3.4' + s.version = '1.3.5' s.summary = '🎨 A view that can be highlighted after formatting JSON.' diff --git a/JSONPreview.xcodeproj/project.pbxproj b/JSONPreview.xcodeproj/project.pbxproj index 8ffc3f4..0e7d603 100644 --- a/JSONPreview.xcodeproj/project.pbxproj +++ b/JSONPreview.xcodeproj/project.pbxproj @@ -501,7 +501,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 12; + CURRENT_PROJECT_VERSION = 13; DEVELOPMENT_TEAM = 5C9JW4S9DE; INFOPLIST_FILE = "$(SRCROOT)/JSONPreview/Other/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -509,7 +509,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.3.1; + MARKETING_VERSION = 1.3.5; PRODUCT_BUNDLE_IDENTIFIER = com.rakuyo.JSONPreview; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -523,7 +523,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 12; + CURRENT_PROJECT_VERSION = 13; DEVELOPMENT_TEAM = 5C9JW4S9DE; INFOPLIST_FILE = "$(SRCROOT)/JSONPreview/Other/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -531,7 +531,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.3.1; + MARKETING_VERSION = 1.3.5; PRODUCT_BUNDLE_IDENTIFIER = com.rakuyo.JSONPreview; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; diff --git a/JSONPreview/Other/Info.plist b/JSONPreview/Other/Info.plist index 669cdc4..41346cb 100644 --- a/JSONPreview/Other/Info.plist +++ b/JSONPreview/Other/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 1.3.3 + $(MARKETING_VERSION) CFBundleVersion $(CURRENT_PROJECT_VERSION) LSRequiresIPhoneOS diff --git a/JSONPreviewTests/Info.plist b/JSONPreviewTests/Info.plist index 976150a..9a9149c 100644 --- a/JSONPreviewTests/Info.plist +++ b/JSONPreviewTests/Info.plist @@ -15,8 +15,8 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 1.3.4 + 1.3.5 CFBundleVersion - 12 + 13 diff --git a/JSONPreviewUITests/Info.plist b/JSONPreviewUITests/Info.plist index 976150a..9a9149c 100644 --- a/JSONPreviewUITests/Info.plist +++ b/JSONPreviewUITests/Info.plist @@ -15,8 +15,8 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 1.3.4 + 1.3.5 CFBundleVersion - 12 + 13 diff --git a/README.md b/README.md index f3f9800..ff41033 100644 --- a/README.md +++ b/README.md @@ -40,13 +40,13 @@ pod 'JSONPreview' - File > Swift Packages > Add Package Dependency - Add https://github.com/rakuyoMo/JSONPreview.git -- Select "Up to Next Major" with "1.3.2" +- Select "Up to Next Major" with "1.3.5" Or add the following to your `Package.swift` file: ```swift dependencies: [ - .package(url: "https://github.com/rakuyoMo/JSONPreview.git", from: "1.3.2") + .package(url: "https://github.com/rakuyoMo/JSONPreview.git", from: "1.3.5") ] ``` diff --git a/README_CN.md b/README_CN.md index d2727c2..cd7be59 100644 --- a/README_CN.md +++ b/README_CN.md @@ -38,13 +38,13 @@ pod 'JSONPreview' - 依次选择 File > Swift Packages > Add Package Dependency - 输入 https://github.com/rakuyoMo/JSONPreview.git -- 选择 "Up to Next Major" 并填入 "1.3.2" +- 选择 "Up to Next Major" 并填入 "1.3.5" 或者将下面的内容添加到 `Package.swift` 文件中： ```swift dependencies: [ - .package(url: "https://github.com/rakuyoMo/JSONPreview.git", from: "1.3.2") + .package(url: "https://github.com/rakuyoMo/JSONPreview.git", from: "1.3.5") ] ```