Merge branch release/1.3.5

RakuyoKit · Apr 2, 2022 · 95a2215 · 95a2215
2 parents 40e544c + 27d9564
commit 95a2215
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 15 deletions.
diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
diff --git 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
@@ -501,15 +501,15 @@
 			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;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(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,15 +523,15 @@
 			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;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(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
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.3</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSRequiresIPhoneOS</key>

diff --git a/JSONPreviewTests/Info.plist b/JSONPreviewTests/Info.plist
@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.4</string>
+	<string>1.3.5</string>
 	<key>CFBundleVersion</key>
-	<string>12</string>
+	<string>13</string>
 </dict>
 </plist>
diff --git a/JSONPreviewUITests/Info.plist b/JSONPreviewUITests/Info.plist
@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.4</string>
+	<string>1.3.5</string>
 	<key>CFBundleVersion</key>
-	<string>12</string>
+	<string>13</string>
 </dict>
 </plist>
diff --git 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",

diff --git 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
@@ -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")
 ]
 ```