Skip to content

Commit

Permalink
Removed Xcode project and updated project layout
Browse files Browse the repository at this point in the history
  • Loading branch information
colemancda committed Jun 3, 2017
1 parent be09490 commit 10946dc
Show file tree
Hide file tree
Showing 28 changed files with 43 additions and 927 deletions.
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Xcode/Cairo.xcodeproj/project.xcworkspace/xcuserdata/
Xcode/Cairo.xcodeproj/xcuserdata
Cairo.xcodeproj
.build
Packages
24 changes: 24 additions & 0 deletions Package.pins
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"autoPin": true,
"pins": [
{
"package": "CCairo",
"reason": null,
"repositoryURL": "https://github.com/PureSwift/CCairo.git",
"version": "1.1.1"
},
{
"package": "CFontConfig",
"reason": null,
"repositoryURL": "https://github.com/PureSwift/CFontConfig.git",
"version": "1.0.1"
},
{
"package": "CFreeType",
"reason": null,
"repositoryURL": "https://github.com/PureSwift/CFreeType.git",
"version": "1.0.3"
}
],
"version": 1
}
3 changes: 1 addition & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,5 @@ let package = Package(
.Package(url: "https://github.com/PureSwift/CCairo.git", majorVersion: 1),
.Package(url: "https://github.com/PureSwift/CFontConfig.git", majorVersion: 1),
.Package(url: "https://github.com/PureSwift/CFreeType.git", majorVersion: 1)
],
exclude: ["Xcode", "Sources/CairoUnitTests"]
]
)
17 changes: 0 additions & 17 deletions Sources/CairoUnitTests/CairoTest.h

This file was deleted.

93 changes: 0 additions & 93 deletions Sources/CairoUnitTests/CairoTest.m

This file was deleted.

5 changes: 0 additions & 5 deletions Sources/CairoUnitTests/CairoTests-Bridging-Header.h

This file was deleted.

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.
12 changes: 12 additions & 0 deletions Tests/LinuxMain.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
//
// main.swift
// SwiftFoundation
//
// Created by Alsey Coleman Miller on 12/16/15.
// Copyright © 2015 PureSwift. All rights reserved.
//

import XCTest
@testable import UnitTests

XCTMain([testCase(CairoTests.allTests)])
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,18 @@
//

import XCTest
import Cairo
import Foundation
@testable import Cairo

final class CairoTests: XCTestCase {

static let allTests = [("testSourceX", testSourceX)]

func testSourceX() {

// write original

let filename = outputDirectory + "sourceX.png"

CairoTest.sourceX(filename)

print("Wrote original to \(filename)")

// write swift copy

let testFilename = outputDirectory + "sourceXTest.png"
let testFilename = outputDirectory + "sourceX.png"

let surface = Surface(format: .argb32, width: 120, height: 120)

Expand Down Expand Up @@ -56,11 +51,6 @@ final class CairoTests: XCTestCase {
surface.writePNG(to: testFilename)

print("Wrote test to \(testFilename)")

let fileData = try? Data(contentsOf: URL(fileURLWithPath: filename))
let testFileData = try? Data(contentsOf: URL(fileURLWithPath: testFilename))

XCTAssert(fileData == testFileData)
}
}

Expand Down
Loading

0 comments on commit 10946dc

Please sign in to comment.