Skip to content

Commit

Permalink
Merge pull request #23 from jinSasaki/pod-update
Browse files Browse the repository at this point in the history
Clear duplicate files and Support Xcode8.3
  • Loading branch information
jinSasaki committed Mar 28, 2017
2 parents 7dab42e + 1f51126 commit 74850be
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 313 deletions.
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0
3.1
2 changes: 1 addition & 1 deletion AlertBar.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "AlertBar"
s.version = "0.3.1"
s.version = "0.3.2"
s.summary = "An easy alert on status bar."
s.homepage = "https://github.com/jinSasaki/AlertBar"
s.screenshots = "https://github.com/jinSasaki/AlertBar/raw/master/assets/demo.gif"
Expand Down
14 changes: 7 additions & 7 deletions AlertBar.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
93A4C4761E223B0B00C0962F /* AlertBar.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 93A4C46C1E223B0B00C0962F /* AlertBar.framework */; };
93A4C47B1E223B0B00C0962F /* AlertBarTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93A4C47A1E223B0B00C0962F /* AlertBarTests.swift */; };
93A4C47D1E223B0B00C0962F /* AlertBar.h in Headers */ = {isa = PBXBuildFile; fileRef = 93A4C46F1E223B0B00C0962F /* AlertBar.h */; settings = {ATTRIBUTES = (Public, ); }; };
93A4C4A91E223DD700C0962F /* AlertBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93A4C4A81E223DD700C0962F /* AlertBar.swift */; };
93C0F48D1E8AC52800F15353 /* AlertBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93C0F48C1E8AC52800F15353 /* AlertBar.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -30,7 +30,7 @@
93A4C4751E223B0B00C0962F /* AlertBarTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AlertBarTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
93A4C47A1E223B0B00C0962F /* AlertBarTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlertBarTests.swift; sourceTree = "<group>"; };
93A4C47C1E223B0B00C0962F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
93A4C4A81E223DD700C0962F /* AlertBar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AlertBar.swift; sourceTree = "<group>"; };
93C0F48C1E8AC52800F15353 /* AlertBar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AlertBar.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -74,7 +74,7 @@
isa = PBXGroup;
children = (
93A4C46F1E223B0B00C0962F /* AlertBar.h */,
93A4C4A71E223DD700C0962F /* Sources */,
93C0F48B1E8AC52800F15353 /* Sources */,
93A4C4701E223B0B00C0962F /* Info.plist */,
);
path = AlertBar;
Expand All @@ -89,13 +89,13 @@
path = AlertBarTests;
sourceTree = "<group>";
};
93A4C4A71E223DD700C0962F /* Sources */ = {
93C0F48B1E8AC52800F15353 /* Sources */ = {
isa = PBXGroup;
children = (
93A4C4A81E223DD700C0962F /* AlertBar.swift */,
93C0F48C1E8AC52800F15353 /* AlertBar.swift */,
);
path = Sources;
sourceTree = "<group>";
sourceTree = SOURCE_ROOT;
};
/* End PBXGroup section */

Expand Down Expand Up @@ -208,7 +208,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
93A4C4A91E223DD700C0962F /* AlertBar.swift in Sources */,
93C0F48D1E8AC52800F15353 /* AlertBar.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
149 changes: 0 additions & 149 deletions AlertBar/Sources/AlertBar.swift

This file was deleted.

8 changes: 4 additions & 4 deletions Example/AlertBarExample.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
93A4C4981E223C7B00C0962F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 93A4C4961E223C7B00C0962F /* Main.storyboard */; };
93A4C49A1E223C7B00C0962F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 93A4C4991E223C7B00C0962F /* Assets.xcassets */; };
93A4C49D1E223C7B00C0962F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 93A4C49B1E223C7B00C0962F /* LaunchScreen.storyboard */; };
93A4C4A61E223CDB00C0962F /* AlertBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93A4C4A51E223CDB00C0962F /* AlertBar.swift */; };
93C0F48A1E8AC48500F15353 /* AlertBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93C0F4891E8AC48500F15353 /* AlertBar.swift */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand All @@ -23,7 +23,7 @@
93A4C4991E223C7B00C0962F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
93A4C49C1E223C7B00C0962F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
93A4C49E1E223C7B00C0962F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
93A4C4A51E223CDB00C0962F /* AlertBar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AlertBar.swift; sourceTree = "<group>"; };
93C0F4891E8AC48500F15353 /* AlertBar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AlertBar.swift; path = ../../../AlertBar/Sources/AlertBar.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -70,7 +70,7 @@
93A4C4A41E223CDB00C0962F /* Sources */ = {
isa = PBXGroup;
children = (
93A4C4A51E223CDB00C0962F /* AlertBar.swift */,
93C0F4891E8AC48500F15353 /* AlertBar.swift */,
);
path = Sources;
sourceTree = "<group>";
Expand Down Expand Up @@ -148,7 +148,7 @@
buildActionMask = 2147483647;
files = (
93A4C4951E223C7B00C0962F /* ViewController.swift in Sources */,
93A4C4A61E223CDB00C0962F /* AlertBar.swift in Sources */,
93C0F48A1E8AC48500F15353 /* AlertBar.swift in Sources */,
93A4C4931E223C7B00C0962F /* AppDelegate.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
149 changes: 0 additions & 149 deletions Example/AlertBarExample/Sources/AlertBar.swift

This file was deleted.

Loading

0 comments on commit 74850be

Please sign in to comment.