dnrops
/
Tokamak
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove Quick and Nimble dependencies

This commit is contained in:
Max Desiatov 2018-11-27 10:00:32 +00:00
parent 819cb6fa13
commit 5e3270202a
No known key found for this signature in database
GPG Key ID: FE08EBF9CF58CBA2
6 changed files with 55 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
Example/Gluon.xcodeproj/project.pbxproj
View File

@ -12,8 +12,7 @@
607FACDB1AFB9204008FA782 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 607FACD91AFB9204008FA782 /* Main.storyboard */; };
607FACDD1AFB9204008FA782 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDC1AFB9204008FA782 /* Images.xcassets */; };
607FACE01AFB9204008FA782 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDE1AFB9204008FA782 /* LaunchScreen.xib */; };
607FACEC1AFB9204008FA782 /* Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACEB1AFB9204008FA782 /* Tests.swift */; };
B317BD2F1AD18A7F514CA335 /* Pods_Gluon_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C1B4A8D80770145FDAFEAE64 /* Pods_Gluon_Tests.framework */; };
D1E6BCD221AD4CD6002769E3 /* GluonTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1E6BCD121AD4CD6002769E3 /* GluonTest.swift */; };
E5226F2FEFBADF8F2E0F0846 /* Pods_Gluon_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F369EAC5434B4E52EB412B5 /* Pods_Gluon_Example.framework */; };
/* End PBXBuildFile section */
@ -40,12 +39,10 @@
607FACDF1AFB9204008FA782 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
607FACE51AFB9204008FA782 /* Gluon_Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Gluon_Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
607FACEA1AFB9204008FA782 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
607FACEB1AFB9204008FA782 /* Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tests.swift; sourceTree = "<group>"; };
8CADEBB8BFF6F2621CA49E8F /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
B56CFE53515A8A8E073D5254 /* Pods-Gluon_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Gluon_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Gluon_Tests/Pods-Gluon_Tests.debug.xcconfig"; sourceTree = "<group>"; };
C1B4A8D80770145FDAFEAE64 /* Pods_Gluon_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Gluon_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
C6DA99382B6892EAB361742F /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
DB9D7B418828F169C47C3FBE /* Pods-Gluon_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Gluon_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-Gluon_Tests/Pods-Gluon_Tests.release.xcconfig"; sourceTree = "<group>"; };
D1E6BCD121AD4CD6002769E3 /* GluonTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GluonTest.swift; sourceTree = "<group>"; };
E7F808D1B3715FF294877289 /* Pods-Gluon_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Gluon_Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-Gluon_Example/Pods-Gluon_Example.release.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */
@ -62,7 +59,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
B317BD2F1AD18A7F514CA335 /* Pods_Gluon_Tests.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -117,7 +113,7 @@
607FACE81AFB9204008FA782 /* Tests */ = {
isa = PBXGroup;
children = (
607FACEB1AFB9204008FA782 /* Tests.swift */,
D1E6BCD121AD4CD6002769E3 /* GluonTest.swift */,
607FACE91AFB9204008FA782 /* Supporting Files */,
);
path = Tests;
@ -155,8 +151,6 @@
children = (
2EACD4D4A09D2A5A83D8CCFC /* Pods-Gluon_Example.debug.xcconfig */,
E7F808D1B3715FF294877289 /* Pods-Gluon_Example.release.xcconfig */,
B56CFE53515A8A8E073D5254 /* Pods-Gluon_Tests.debug.xcconfig */,
DB9D7B418828F169C47C3FBE /* Pods-Gluon_Tests.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
@ -187,11 +181,9 @@
isa = PBXNativeTarget;
buildConfigurationList = 607FACF21AFB9204008FA782 /* Build configuration list for PBXNativeTarget "Gluon_Tests" */;
buildPhases = (
44ABDF39F9E0937D840CB472 /* [CP] Check Pods Manifest.lock */,
607FACE11AFB9204008FA782 /* Sources */,
607FACE21AFB9204008FA782 /* Frameworks */,
607FACE31AFB9204008FA782 /* Resources */,
0564A6482241840A1B781F41 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
@ -221,7 +213,7 @@
607FACE41AFB9204008FA782 = {
CreatedOnToolsVersion = 6.3.1;
DevelopmentTeam = H4Z9Z4RD2G;
LastSwiftMigration = 1000;
LastSwiftMigration = 1010;
TestTargetID = 607FACCF1AFB9204008FA782;
};
};
@ -266,33 +258,13 @@
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
0564A6482241840A1B781F41 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-Gluon_Tests/Pods-Gluon_Tests-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/Nimble/Nimble.framework",
"${BUILT_PRODUCTS_DIR}/Quick/Quick.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Nimble.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Quick.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Gluon_Tests/Pods-Gluon_Tests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
2132F5AA09233E3565154DB1 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-Gluon_Example/Pods-Gluon_Example-frameworks.sh",
"${PODS_ROOT}/Target Support Files/Pods-Gluon_Example/Pods-Gluon_Example-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/Gluon/Gluon.framework",
);
name = "[CP] Embed Pods Frameworks";
@ -301,25 +273,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Gluon_Example/Pods-Gluon_Example-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
44ABDF39F9E0937D840CB472 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-Gluon_Tests-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Gluon_Example/Pods-Gluon_Example-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
EC5FD3EFB14C0031402120B7 /* [CP] Check Pods Manifest.lock */ = {
@ -356,7 +310,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
607FACEC1AFB9204008FA782 /* Tests.swift in Sources */,
D1E6BCD221AD4CD6002769E3 /* GluonTest.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -525,8 +479,8 @@
};
607FACF31AFB9204008FA782 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = B56CFE53515A8A8E073D5254 /* Pods-Gluon_Tests.debug.xcconfig */;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
DEVELOPMENT_TEAM = H4Z9Z4RD2G;
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
@ -540,6 +494,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.2;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Gluon_Example.app/Gluon_Example";
};
@ -547,8 +502,8 @@
};
607FACF41AFB9204008FA782 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = DB9D7B418828F169C47C3FBE /* Pods-Gluon_Tests.release.xcconfig */;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
DEVELOPMENT_TEAM = H4Z9Z4RD2G;
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",

8
Example/Podfile
View File

@ -1,12 +1,6 @@
platform :ios, '9.0'
use_frameworks!
target 'Gluon_Example' do
pod 'Gluon', :path => '../'
target 'Gluon_Tests' do
inherit! :search_paths
pod 'Quick', '~> 1.3.1'
pod 'Nimble', '~> 7.3.0'
end
end

17
Example/Podfile.lock
View File

@ -1,27 +1,16 @@
PODS:
- Gluon (0.1.0)
- Nimble (7.3.1)
- Quick (1.3.2)
DEPENDENCIES:
- Gluon (from `../`)
- Nimble (~> 7.3.0)
- Quick (~> 1.3.1)
SPEC REPOS:
https://github.com/cocoapods/specs.git:
- Nimble
- Quick
EXTERNAL SOURCES:
Gluon:
:path: "../"
SPEC CHECKSUMS:
Gluon: ca6375837dbef323da65f89cf658903f2fec7ac6
Nimble: 04f732da099ea4d153122aec8c2a88fd0c7219ae
Quick: 2623cb30d7a7f41ca62f684f679586558f483d46
Gluon: 64d89b9a383e0e5d570bd66cba1e5537ece85454
PODFILE CHECKSUM: f62d67b72e773ef80ecf48f4a455fa18e5820389
PODFILE CHECKSUM: cc59d174d17ab62ebcc753b893ddecc8b72783bd
COCOAPODS: 1.5.3
COCOAPODS: 1.6.0.beta.2

33
Example/Tests/GluonTest.swift Normal file
View File

@ -0,0 +1,33 @@
//
// GluonTest.swift
// Gluon_Tests
//
// Created by Max Desiatov on 27/11/2018.
// Copyright © 2018 CocoaPods. All rights reserved.
//
import XCTest
class GluonTest: XCTestCase {
override func setUp() {
// Put setup code here. This method is called before the invocation of each test method in the class.
}
override func tearDown() {
// Put teardown code here. This method is called after the invocation of each test method in the class.
}
func testExample() {
// This is an example of a functional test case.
// Use XCTAssert and related functions to verify your tests produce the correct results.
}
func testPerformanceExample() {
// This is an example of a performance test case.
self.measure {
// Put the code you want to measure the time of here.
}
}
}

50
Example/Tests/Tests.swift
View File

@ -1,50 +0,0 @@
// https://github.com/Quick/Quick
import Quick
import Nimble
import Gluon
class TableOfContentsSpec: QuickSpec {
override func spec() {
describe("these will fail") {
it("can do maths") {
expect(1) == 2
}
it("can read") {
expect("number") == "string"
}
it("will eventually fail") {
expect("time").toEventually( equal("done") )
}
context("these will pass") {
it("can do maths") {
expect(23) == 23
}
it("can read") {
expect("🐮") == "🐮"
}
it("will eventually pass") {
var time = "passing"
DispatchQueue.main.async {
time = "done"
}
waitUntil { done in
Thread.sleep(forTimeInterval: 0.5)
expect(time) == "done"
done()
}
}
}
}
}
}

9
Gluon/Source/UIKitRenderer.swift
View File

@ -14,7 +14,7 @@ protocol Renderer {
}
protocol Reconciler {
func reconcile(node: Node)
}
protocol RendererBaseComponent {
@ -24,6 +24,13 @@ protocol RendererBaseComponent {
protocol UIKitBaseComponent: RendererBaseComponent {
}
struct StackReconciler: Reconciler {
func reconcile(node: Node) {
}
}
class UIKitRenderer {
}