Skip to content

Commit ccf4b37

Browse files
author
Pedro Piñera
committed
Rename xcproj to xcodeproj
1 parent b4e95cd commit ccf4b37

File tree

242 files changed

+2267
-2448
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

242 files changed

+2267
-2448
lines changed

.github/ISSUE_TEMPLATE.md

+1-4

.github/stale.yml

-14
This file was deleted.

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,6 @@ xcuserdata
180180
.vscode
181181

182182
build/
183-
xcproj.xcodeproj
183+
xcodeproj.xcodeproj
184184
.idea/
185185
tmp/

.jazzy.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
author: xcode.swift
2-
module: xcproj
1+
author: xcbuddy
2+
module: xcodeproj
33
module_version: 0.0.1
44
github_url: https://github.com/xcbuddy/xcodeproj
5-
copyright: 'Copyright © 2017 xcode.swift. All rights reserved.'
5+
copyright: 'Copyright © from 2018 Pedro Piñera Buendía. All rights reserved.'
66
readme: ABOUT.md
77
documentation: guides/*.md
88
custom_categories:

CHANGELOG.md

+3

Cartfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
github "tadija/AEXML" ~> 4.3.0
2-
github "xcodeswift/PathKit" "a0d19059fedf44e8dd70f635144b828f675c4d3e"
2+
github "xcbuddy/PathKit" "a0d19059fedf44e8dd70f635144b828f675c4d3e"

Cartfile.resolved

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
github "tadija/AEXML" "4.3.0"
2-
github "xcodeswift/PathKit" "a0d19059fedf44e8dd70f635144b828f675c4d3e"
2+
github "xcbuddy/PathKit" "a0d19059fedf44e8dd70f635144b828f675c4d3e"

CarthageInfo.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@
2525
<key>LSMinimumSystemVersion</key>
2626
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
2727
<key>NSHumanReadableCopyright</key>
28-
<string>Copyright © 2018 xcode.swift. All rights reserved.</string>
28+
<string>Copyright © from 2018 Pedro Piñera Buendía. All rights reserved.</string>
2929
</dict>
3030
</plist>

CocoaPods/CocoaPods.xcodeproj/project.pbxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@
160160
attributes = {
161161
LastSwiftUpdateCheck = 0900;
162162
LastUpgradeCheck = 0900;
163-
ORGANIZATIONNAME = xcode.swift;
163+
ORGANIZATIONNAME = xcbuddy;
164164
TargetAttributes = {
165165
04F4733C1F8058B80059DA8D = {
166166
CreatedOnToolsVersion = 9.0;

CocoaPods/Podfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ use_frameworks!
22

33
target 'iOS' do
44
platform :ios, "8.0"
5-
pod "xcproj", :path => "../"
5+
pod "xcodeproj", :path => "../"
66
end
77

88
target 'macOS' do
99
platform :osx, "10.12"
10-
pod "xcproj", :path => "../"
10+
pod "xcodeproj", :path => "../"
1111
end

Danger/carthage.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def execute
1414
private
1515

1616
def added_or_deleted_sources
17-
(git.added_files + git.deleted_files).select {|path| path.include?("Sources/xcproj")}
17+
(git.added_files + git.deleted_files).select {|path| path.include?("Sources/xcodeproj")}
1818
end
1919

2020
def project_modified

Fixtures/iOS/BuildSettings.xcodeproj/project.pbxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
attributes = {
3030
LastSwiftUpdateCheck = 0920;
3131
LastUpgradeCheck = 0920;
32-
ORGANIZATIONNAME = xcodeswift;
32+
ORGANIZATIONNAME = xcbuddy;
3333
};
3434
buildConfigurationList = E4966A3A1FBAFF5F00CDE63E /* Build configuration list for PBXProject "BuildSettings" */;
3535
compatibilityVersion = "Xcode 8.0";

Fixtures/iOS/ProjectWithoutProductsGroup.xcodeproj/project.pbxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
attributes = {
2222
LastSwiftUpdateCheck = 0920;
2323
LastUpgradeCheck = 0920;
24-
ORGANIZATIONNAME = xcodeswift;
24+
ORGANIZATIONNAME = xcbuddy;
2525
};
2626
buildConfigurationList = E4C06A7F1FC1CA8500A9AB51 /* Build configuration list for PBXProject "ProjectWithoutProductsGroup" */;
2727
compatibilityVersion = "Xcode 8.0";

Gemfile

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ gem "jazzy"
55
gem "semantic"
66
gem "colorize"
77
gem "cocoapods"
8-
gem 'danger-xcodeswift', :git => "https://github.com/xcodeswift/danger", require: false
98
gem "git"
109
gem "rspec"
1110
gem "xcpretty"

Gemfile.lock

-15
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
GIT
2-
remote: https://github.com/xcodeswift/danger
3-
revision: d5b65a1279db28f9f88b665887826aa83007915c
4-
specs:
5-
danger-xcodeswift (0.1.0)
6-
danger (~> 5.5.5)
7-
danger-changelog (~> 0.2.0)
8-
danger-plugin-api (~> 1.0)
9-
danger-swiftlint (~> 0.16.0)
10-
111
GEM
122
remote: https://rubygems.org/
133
specs:
@@ -75,10 +65,6 @@ GEM
7565
no_proxy_fix
7666
octokit (~> 4.7)
7767
terminal-table (~> 1)
78-
danger-changelog (0.2.1)
79-
danger-plugin-api (~> 1.0)
80-
danger-plugin-api (1.0.0)
81-
danger (> 2.0)
8268
danger-swiftlint (0.16.0)
8369
danger
8470
rake (> 10)
@@ -172,7 +158,6 @@ DEPENDENCIES
172158
cocoapods
173159
colorize
174160
danger-swiftlint
175-
danger-xcodeswift!
176161
git
177162
jazzy
178163
rake

LICENSE.md

+1-1

Package.swift

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22

33
import PackageDescription
44
let package = Package(
5-
name: "xcproj",
5+
name: "xcodeproj",
66
products: [
7-
.library(name: "xcproj", targets: ["xcproj"]),
7+
.library(name: "xcodeproj", targets: ["xcodeproj"]),
88
],
99
dependencies: [
1010
.package(url: "https://github.com/kylef/PathKit.git", .upToNextMajor(from: "0.9.1")),
1111
.package(url: "https://github.com/tadija/AEXML.git", .upToNextMajor(from: "4.3.0")),
1212
.package(url: "https://github.com/JohnSundell/ShellOut.git", from: "2.0.0")
1313
],
1414
targets: [
15-
.target(name: "xcproj",
15+
.target(name: "xcodeproj",
1616
dependencies: ["PathKit", "AEXML"]),
17-
.testTarget(name: "xcprojTests", dependencies: ["xcproj"]),
18-
.testTarget(name: "xcprojIntegrationTests", dependencies: ["xcproj", "PathKit", "ShellOut"]),
17+
.testTarget(name: "xcodeprojTests", dependencies: ["xcodeproj"]),
18+
.testTarget(name: "xcodeprojIntegrationTests", dependencies: ["xcodeproj", "PathKit", "ShellOut"]),
1919
]
2020
)

README.md

+10-10

RELEASE.md

+3-3

Rakefile

+8-8
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ end
1616
def generate_docs
1717
print "Generating docs"
1818
sh "swift package generate-xcodeproj"
19-
sh "jazzy --clean --sdk macosx --xcodebuild-arguments -project,xcproj.xcodeproj,-scheme,xcproj-Package --skip-undocumented"
19+
sh "jazzy --clean --sdk macosx --xcodebuild-arguments -project,xcodeproj.xcodeproj,-scheme,xcodeproj-Package --skip-undocumented"
2020
end
2121

2222
def any_git_changes?
@@ -33,20 +33,20 @@ def build
3333
end
3434

3535
def build_carthage_project
36-
sh "xcodebuild -project Carthage.xcodeproj -scheme xcproj_macOS -config Debug clean build"
37-
sh "xcodebuild -project Carthage.xcodeproj -scheme xcproj_iOS -config Debug -destination '#{DESTINATION}' clean build"
36+
sh "xcodebuild -project Carthage.xcodeproj -scheme xcodeproj_macOS -config Debug clean build"
37+
sh "xcodebuild -project Carthage.xcodeproj -scheme xcodeproj_iOS -config Debug -destination '#{DESTINATION}' clean build"
3838
end
3939

4040
task :carthage do
4141
build_carthage_project()
4242
end
4343

4444
def test_swift
45-
sh "xcodebuild -project xcproj.xcodeproj -scheme xcproj-Package -only-testing:xcprojTests -config Debug test -enableCodeCoverage YES"
45+
sh "xcodebuild -project xcodeproj.xcodeproj -scheme xcodeproj-Package -only-testing:xcodeprojTests -config Debug test -enableCodeCoverage YES"
4646
end
4747

4848
def test_swift_integration
49-
sh "swift test --filter xcprojIntegrationTests"
49+
sh "swift test --filter xcodeprojIntegrationTests"
5050
end
5151

5252
def test_ruby
@@ -63,7 +63,7 @@ def next_version(type)
6363
end
6464

6565
def bump_to_version(from, to)
66-
spec_path = "xcproj.podspec"
66+
spec_path = "xcodeproj.podspec"
6767
content = File.read(spec_path)
6868
File.open(spec_path, "w"){|f| f.write(content.sub(from.to_s, to.to_s)) }
6969
end
@@ -132,11 +132,11 @@ task :deploy_to_integration do
132132
end
133133
end
134134

135-
desc "Bumps the version of xcproj. It creates a new tagged commit and archives the binary to be published with the release"
135+
desc "Bumps the version of xcodeproj. It creates a new tagged commit and archives the binary to be published with the release"
136136
task :release do
137137
abort "You should specify the type (e.g. RELEASE_TYPE=minor rake task release)" unless ENV["RELEASE_TYPE"]
138138
# abort 'Commit all your changes before starting the release' unless !any_git_changes?
139-
print("Building xcproj")
139+
print("Building xcodeproj")
140140
build
141141
print "Generating Carthage project"
142142
generate_carthage_project()
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.

Tests/LinuxMain.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
import XCTest
2-
@testable import xcprojTests
2+
@testable import xcodeprojTests
33

44
// testDictionaryExtras()

Tests/xcprojIntegrationTests/OSSProjectsTests.swift renamed to Tests/xcodeprojIntegrationTests/OSSProjectsTests.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import Foundation
22
import XCTest
33
import PathKit
44
import ShellOut
5-
import xcproj
5+
import xcodeproj
66

77
final class OSSProjectsTests: XCTestCase {
88

Tests/xcprojTests/BuildPhaseSpecs.swift renamed to Tests/xcodeprojTests/BuildPhaseSpecs.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Foundation
22
import XCTest
3-
import xcproj
3+
import xcodeproj
44

55
class BuildPhaseSpecs: XCTestCase {
66

Tests/xcprojTests/Dictionary+ExtrasSpec.swift renamed to Tests/xcodeprojTests/Dictionary+ExtrasSpec.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Foundation
22
import PathKit
33
import XCTest
4-
import xcproj
4+
import xcodeproj
55

66
class DictionaryExtrasSpec: XCTestCase {
77

Tests/xcprojTests/Fixtures.swift renamed to Tests/xcodeprojTests/Fixtures.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Foundation
22
import PathKit
3-
import xcproj
3+
import xcodeproj
44

55
func fixturesPath() -> Path {
66
return Path(#file).parent().parent().parent() + Path("Fixtures")

Tests/xcprojTests/PBXAggregateTargetSpec.swift renamed to Tests/xcodeprojTests/PBXAggregateTargetSpec.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Foundation
22
import XCTest
3-
import xcproj
3+
import xcodeproj
44

55
final class PBXAggregateTargetSpec: XCTestCase {
66

Tests/xcprojTests/PBXBuildFileSpec.swift renamed to Tests/xcodeprojTests/PBXBuildFileSpec.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Foundation
22
import XCTest
3-
import xcproj
3+
import xcodeproj
44

55
final class PBXBuildFileSpec: XCTestCase {
66

0 commit comments

Comments
 (0)