Merge branch release/2.0.0

RakuyoKit · Mar 13, 2023 · d4eafee · d4eafee
2 parents b6994ee + cdd1a0c
commit d4eafee
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/JSONPreview.podspec b/JSONPreview.podspec
@@ -5,19 +5,19 @@ Pod::Spec.new do |s|
 
   s.name             = 'JSONPreview'
 
-  s.version          = '2.0.0-beta.2'
+  s.version          = '2.0.0'
 
   s.summary          = '🎨 A view that can be highlighted after formatting JSON.'
 
   s.description      = '🎨 A view that can be highlighted after formatting JSON. It also provides folding function.'
 
-  s.homepage         = 'https://github.com/rakuyoMo/JSONPreview'
+  s.homepage         = 'https://github.com/RakuyoKit/JSONPreview'
 
   s.license          = 'MIT'
 
   s.author           = { 'Rakuyo' => 'rakuyo.mo@gmail.com' }
 
-  s.source           = { :git => 'https://github.com/rakuyoMo/JSONPreview.git', :tag => s.version.to_s }
+  s.source           = { :git => 'https://github.com/RakuyoKit/JSONPreview.git', :tag => s.version.to_s }
 
   s.requires_arc     = true
 

diff --git a/JSONPreview.xcodeproj/project.pbxproj b/JSONPreview.xcodeproj/project.pbxproj
@@ -545,7 +545,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 16;
+				CURRENT_PROJECT_VERSION = 17;
 				DEVELOPMENT_TEAM = 5C9JW4S9DE;
 				INFOPLIST_FILE = "$(SRCROOT)/JSONPreview/Other/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
@@ -567,7 +567,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 16;
+				CURRENT_PROJECT_VERSION = 17;
 				DEVELOPMENT_TEAM = 5C9JW4S9DE;
 				INFOPLIST_FILE = "$(SRCROOT)/JSONPreview/Other/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;

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.6</string>
+	<string>2.0.0</string>
 	<key>CFBundleVersion</key>
-	<string>14</string>
+	<string>17</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.6</string>
+	<string>2.0.0</string>
 	<key>CFBundleVersion</key>
-	<string>14</string>
+	<string>17</string>
 </dict>
 </plist>
diff --git a/push.sh b/push.sh
@@ -35,7 +35,7 @@ release(){
 
     git_message="[Release] version: $version build: $build"
 
-    git add . && git commit -m $git_message
+    git add . && git commit -m "$git_message"
 
     git checkout master
     git merge --no-ff -m 'Merge branch '$release_branch'' $release_branch