Skip to content

Commit

Permalink
Merge branch release/1.3.4
Browse files Browse the repository at this point in the history
  • Loading branch information
rakuyoMo committed Apr 2, 2022
2 parents 037c898 + 0345aad commit 40e544c
Show file tree
Hide file tree
Showing 52 changed files with 85 additions and 110 deletions.
6 changes: 3 additions & 3 deletions JSONPreview/JSONPreview.podspec → JSONPreview.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Pod::Spec.new do |s|

s.name = 'JSONPreview'

s.version = '1.3.3'
s.version = '1.3.4'

s.summary = '🎨 A view that can be highlighted after formatting JSON.'

Expand All @@ -29,10 +29,10 @@ Pod::Spec.new do |s|

s.module_name = 'JSONPreview'

s.source_files = 'JSONPreview/JSONPreview/Core/*'
s.source_files = 'JSONPreview/Core/*'

s.resource_bundle = {
'JSONPreviewBundle' => [ 'JSONPreview/JSONPreview/Other/*.xcassets' ]
'JSONPreviewBundle' => [ 'JSONPreview/Other/*.xcassets' ]
}

end
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@
objects = {

/* Begin PBXBuildFile section */
3A134BCD251486B3002AAFA6 /* JSONPreview.podspec in Resources */ = {isa = PBXBuildFile; fileRef = 3A134BCB251486B3002AAFA6 /* JSONPreview.podspec */; };
3A134BCE251486B3002AAFA6 /* push.sh in Resources */ = {isa = PBXBuildFile; fileRef = 3A134BCC251486B3002AAFA6 /* push.sh */; };
3A134C6625148A31002AAFA6 /* default.png in Resources */ = {isa = PBXBuildFile; fileRef = 3A134C6525148A31002AAFA6 /* default.png */; };
3A134C7425148CB0002AAFA6 /* README_CN.md in Resources */ = {isa = PBXBuildFile; fileRef = 3A134C7225148CB0002AAFA6 /* README_CN.md */; };
3A134C7525148CB0002AAFA6 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 3A134C7325148CB0002AAFA6 /* README.md */; };
3A1F069E2508D1D800C16862 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A1F069D2508D1D800C16862 /* AppDelegate.swift */; };
3A1F06A22508D1D800C16862 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A1F06A12508D1D800C16862 /* ViewController.swift */; };
3A1F06A52508D1D800C16862 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3A1F06A32508D1D800C16862 /* Main.storyboard */; };
Expand All @@ -28,6 +23,7 @@
3A9DB22D2509D7F4002E7B15 /* HighlightColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A9DB22C2509D7F4002E7B15 /* HighlightColor.swift */; };
3A9DB22F2509DA7A002E7B15 /* HighlightStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A9DB22E2509DA7A002E7B15 /* HighlightStyle.swift */; };
3A9DB33D250A0DB4002E7B15 /* LineNumberTableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A9DB33C250A0DB4002E7B15 /* LineNumberTableView.swift */; };
AE5465DE27F7DDEA00201BD0 /* default.png in Resources */ = {isa = PBXBuildFile; fileRef = AE5465DD27F7DDEA00201BD0 /* default.png */; };
AE71889A26FADA8300A16878 /* String+ValidURL.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE71889926FADA8300A16878 /* String+ValidURL.swift */; };
/* End PBXBuildFile section */

Expand All @@ -51,9 +47,6 @@
/* Begin PBXFileReference section */
3A134BCB251486B3002AAFA6 /* JSONPreview.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; path = JSONPreview.podspec; sourceTree = SOURCE_ROOT; };
3A134BCC251486B3002AAFA6 /* push.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = push.sh; sourceTree = SOURCE_ROOT; };
3A134C6525148A31002AAFA6 /* default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = default.png; sourceTree = SOURCE_ROOT; };
3A134C7225148CB0002AAFA6 /* README_CN.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; name = README_CN.md; path = ../../README_CN.md; sourceTree = "<group>"; };
3A134C7325148CB0002AAFA6 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../../README.md; sourceTree = "<group>"; };
3A1F069A2508D1D800C16862 /* JSONPreview.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = JSONPreview.app; sourceTree = BUILT_PRODUCTS_DIR; };
3A1F069D2508D1D800C16862 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
3A1F06A12508D1D800C16862 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
Expand All @@ -76,6 +69,9 @@
3A9DB22C2509D7F4002E7B15 /* HighlightColor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HighlightColor.swift; sourceTree = "<group>"; };
3A9DB22E2509DA7A002E7B15 /* HighlightStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HighlightStyle.swift; sourceTree = "<group>"; };
3A9DB33C250A0DB4002E7B15 /* LineNumberTableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LineNumberTableView.swift; sourceTree = "<group>"; };
AE5465D927F7DDC800201BD0 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = SOURCE_ROOT; };
AE5465DA27F7DDC800201BD0 /* README_CN.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README_CN.md; sourceTree = SOURCE_ROOT; };
AE5465DD27F7DDEA00201BD0 /* default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = default.png; sourceTree = SOURCE_ROOT; };
AE71889926FADA8300A16878 /* String+ValidURL.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+ValidURL.swift"; sourceTree = "<group>"; };
/* End PBXFileReference section */

Expand Down Expand Up @@ -127,11 +123,11 @@
3A1F069C2508D1D800C16862 /* JSONPreview */ = {
isa = PBXGroup;
children = (
3A134C7325148CB0002AAFA6 /* README.md */,
3A134C7225148CB0002AAFA6 /* README_CN.md */,
AE5465DA27F7DDC800201BD0 /* README_CN.md */,
AE5465D927F7DDC800201BD0 /* README.md */,
3A134BCC251486B3002AAFA6 /* push.sh */,
3A134BCB251486B3002AAFA6 /* JSONPreview.podspec */,
3A134C6525148A31002AAFA6 /* default.png */,
AE5465DD27F7DDEA00201BD0 /* default.png */,
3A1F06CD2508D20700C16862 /* Core */,
3A1F06CE2508D20C00C16862 /* Other */,
);
Expand Down Expand Up @@ -291,13 +287,9 @@
buildActionMask = 2147483647;
files = (
3A1F06AA2508D1DC00C16862 /* LaunchScreen.storyboard in Resources */,
3A134C7425148CB0002AAFA6 /* README_CN.md in Resources */,
3A1F06A72508D1DC00C16862 /* Assets.xcassets in Resources */,
3A1F06A52508D1D800C16862 /* Main.storyboard in Resources */,
3A134BCE251486B3002AAFA6 /* push.sh in Resources */,
3A134BCD251486B3002AAFA6 /* JSONPreview.podspec in Resources */,
3A134C7525148CB0002AAFA6 /* README.md in Resources */,
3A134C6625148A31002AAFA6 /* default.png in Resources */,
AE5465DE27F7DDEA00201BD0 /* default.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -509,7 +501,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 202109231031;
CURRENT_PROJECT_VERSION = 12;
DEVELOPMENT_TEAM = 5C9JW4S9DE;
INFOPLIST_FILE = "$(SRCROOT)/JSONPreview/Other/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
Expand All @@ -522,6 +514,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
};
name = Debug;
};
Expand All @@ -530,7 +523,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 202109231031;
CURRENT_PROJECT_VERSION = 12;
DEVELOPMENT_TEAM = 5C9JW4S9DE;
INFOPLIST_FILE = "$(SRCROOT)/JSONPreview/Other/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
Expand All @@ -543,6 +536,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
};
name = Release;
};
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina6_5" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundleShortVersionString</key>
<string>1.3.3</string>
<key>CFBundleVersion</key>
<string>202111241752</string>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UILaunchStoryboardName</key>
Expand Down
File renamed without changes.
82 changes: 0 additions & 82 deletions JSONPreview/push.sh

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<string>1.3.4</string>
<key>CFBundleVersion</key>
<string>1</string>
<string>12</string>
</dict>
</plist>
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<string>1.3.4</string>
<key>CFBundleVersion</key>
<string>1</string>
<string>12</string>
</dict>
</plist>
File renamed without changes.
File renamed without changes
63 changes: 63 additions & 0 deletions push.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
#!/bin/zsh
# Authoer: Rakuyo
# Update Date: 2022.04.02

project_path=$(cd `dirname $0` ; pwd)

cd $project_path

while read line
do
if [[ $line =~ "s.name" ]] ; then
name=`echo $line | cut -d = -f 2 | cut -d \' -f 2`
fi

if [[ $line =~ "s.version" ]] ; then
version=`echo $line | cut -d = -f 2 | cut -d \' -f 2`
break
fi
done < $(find ./ -name '*.podspec')

lintLib(){
pod lib lint $name.podspec --allow-warnings --skip-tests
}

release(){
release_branch=release/$version

git checkout -b $release_branch develop

agvtool new-marketing-version $version

agvtool next-version -all

build=$(agvtool what-version | tail -n2 | awk -F ' ' '{print $NF}')

git_message="[Release] version: $version build: $build"

git add . && git commit -m $git_message

git checkout master
git merge --no-ff -m 'Merge branch '$release_branch'' $release_branch
git push origin master
git tag $version
git push origin $version
git checkout develop
git merge --no-ff -m 'Merge tag '$version' into develop' $version
git push origin develop
git branch -d $release_branch

pod trunk push $name.podspec --allow-warnings --skip-tests
}

echo "Whether to skip local verification? [Y/N]?"
if read -t 5 is_skip_lint; then
case $is_skip_lint in
(N | n)
lintLib && release;;
(*)
release;;
esac
else
release
fi

0 comments on commit 40e544c

Please sign in to comment.