Skip to content

Commit

Permalink
Update Carthage scripts
Browse files Browse the repository at this point in the history
Support Swift4
  • Loading branch information
Kazuho Okui committed Jul 18, 2017
1 parent 8a0d964 commit 9f22e06
Show file tree
Hide file tree
Showing 7 changed files with 46 additions and 50 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "CarthageScripts"]
path = CarthageScripts
url = https://github.com/flinto/CarthageScripts.git
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ before_install:
script: xcodebuild test -scheme RK4Spring_iOS -sdk iphonesimulator -destination 'platform=iOS
Simulator,name=iPhone 7,OS=11.0'
before_deploy:
- ./script/build.sh --no-skip-current
- ./CarthageScripts/build-static-framework.sh
- carthage archive $FRAMEWORK_NAME
deploy:
provider: releases
Expand Down
1 change: 1 addition & 0 deletions CarthageScripts
Submodule CarthageScripts added at 5eddec
40 changes: 37 additions & 3 deletions RK4SpringDemo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@
6E3BBB531F1E757800894AF1 /* Frameworks */,
6E3BBB541F1E757800894AF1 /* Headers */,
6E3BBB551F1E757800894AF1 /* Resources */,
6EDE4D551F1EA742007374E1 /* Copy framework to Carthage folder */,
);
buildRules = (
);
Expand All @@ -217,6 +218,7 @@
6E3BBB651F1E759800894AF1 /* Frameworks */,
6E3BBB661F1E759800894AF1 /* Headers */,
6E3BBB671F1E759800894AF1 /* Resources */,
6EE360371F1EB3E80055A1DB /* Copy framework to Carthage folder */,
);
buildRules = (
);
Expand Down Expand Up @@ -276,6 +278,7 @@
TargetAttributes = {
6E3BBB561F1E757800894AF1 = {
CreatedOnToolsVersion = 9.0;
LastSwiftMigration = 0900;
};
6E3BBB681F1E759800894AF1 = {
CreatedOnToolsVersion = 9.0;
Expand All @@ -287,7 +290,7 @@
};
6E3C28B51C20A02200CAD137 = {
CreatedOnToolsVersion = 7.2;
LastSwiftMigration = 0800;
LastSwiftMigration = 0900;
};
};
};
Expand Down Expand Up @@ -345,6 +348,37 @@
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
6EDE4D551F1EA742007374E1 /* Copy framework to Carthage folder */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Copy framework to Carthage folder";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "$SRCROOT/CarthageScripts/copy_framework.sh\n ";
};
6EE360371F1EB3E80055A1DB /* Copy framework to Carthage folder */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Copy framework to Carthage folder";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "$SRCROOT/CarthageScripts/copy_framework.sh\n";
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
6E3BBB521F1E757800894AF1 /* Sources */ = {
isa = PBXSourcesBuildPhase;
Expand Down Expand Up @@ -728,7 +762,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.flinto.RK4SpringDemo;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 4.0;
};
name = Debug;
};
Expand All @@ -742,7 +776,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.flinto.RK4SpringDemo;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 4.0;
};
name = Release;
};
Expand Down
7 changes: 4 additions & 3 deletions RK4SpringDemo/ViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
//

import Cocoa
import RK4Spring

class CustomView : NSView {

Expand All @@ -16,9 +17,9 @@ class CustomView : NSView {

class ViewController: NSViewController {

dynamic var tension:Double = 950
dynamic var friction:Double = 60
dynamic var velocity:Double = 0
@objc dynamic var tension:Double = 950
@objc dynamic var friction:Double = 60
@objc dynamic var velocity:Double = 0

@IBOutlet weak var customView:CustomView!
var shape:CAShapeLayer!
Expand Down
11 changes: 0 additions & 11 deletions script/build.sh

This file was deleted.

32 changes: 0 additions & 32 deletions script/ld.py

This file was deleted.

0 comments on commit 9f22e06

Please sign in to comment.