Skip to content

Commit

Permalink
Rename xcproj to xcodeproj
Browse files Browse the repository at this point in the history
  • Loading branch information
Pedro Piñera committed Apr 30, 2018
1 parent b4e95cd commit ccf4b37
Show file tree
Hide file tree
Showing 242 changed files with 2,267 additions and 2,448 deletions.
5 changes: 1 addition & 4 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,4 @@
> Describe here your issue, a bug you found, an idea that you had, something that you think can be improved...
## Proposal πŸŽ‰
> Attach your own proposal *(if you have it)*. We'll discuss in on the issue to find the best one that fits into the library.
<!-- Love xcproj? Please consider supporting our collective:
πŸ‘‰ https://opencollective.com/xcproj/donate -->
> Attach your own proposal *(if you have it)*. We'll discuss in on the issue to find the best one that fits into the library.
14 changes: 0 additions & 14 deletions .github/stale.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,6 @@ xcuserdata
.vscode

build/
xcproj.xcodeproj
xcodeproj.xcodeproj
.idea/
tmp/
6 changes: 3 additions & 3 deletions .jazzy.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
author: xcode.swift
module: xcproj
author: xcbuddy
module: xcodeproj
module_version: 0.0.1
github_url: https://github.com/xcbuddy/xcodeproj
copyright: 'Copyright Β© 2017 xcode.swift. All rights reserved.'
copyright: 'Copyright Β© from 2018 Pedro PiΓ±era BuendΓ­a. All rights reserved.'
readme: ABOUT.md
documentation: guides/*.md
custom_categories:
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## next version

### Breaking
- Rename project to xcodeproj by @pepibumur.

### Added
- Danger check that reports Swiftlint results https://github.com/xcodeswift/xcproj/pull/257 by @pepibumur.

Expand Down
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "tadija/AEXML" ~> 4.3.0
github "xcodeswift/PathKit" "a0d19059fedf44e8dd70f635144b828f675c4d3e"
github "xcbuddy/PathKit" "a0d19059fedf44e8dd70f635144b828f675c4d3e"
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "tadija/AEXML" "4.3.0"
github "xcodeswift/PathKit" "a0d19059fedf44e8dd70f635144b828f675c4d3e"
github "xcbuddy/PathKit" "a0d19059fedf44e8dd70f635144b828f675c4d3e"
2 changes: 1 addition & 1 deletion CarthageInfo.plist
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright Β© 2018 xcode.swift. All rights reserved.</string>
<string>Copyright Β© from 2018 Pedro PiΓ±era BuendΓ­a. All rights reserved.</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion CocoaPods/CocoaPods.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
attributes = {
LastSwiftUpdateCheck = 0900;
LastUpgradeCheck = 0900;
ORGANIZATIONNAME = xcode.swift;
ORGANIZATIONNAME = xcbuddy;
TargetAttributes = {
04F4733C1F8058B80059DA8D = {
CreatedOnToolsVersion = 9.0;
Expand Down
4 changes: 2 additions & 2 deletions CocoaPods/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ use_frameworks!

target 'iOS' do
platform :ios, "8.0"
pod "xcproj", :path => "../"
pod "xcodeproj", :path => "../"
end

target 'macOS' do
platform :osx, "10.12"
pod "xcproj", :path => "../"
pod "xcodeproj", :path => "../"
end
2 changes: 1 addition & 1 deletion Danger/carthage.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def execute
private

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

def project_modified
Expand Down
2 changes: 1 addition & 1 deletion Fixtures/iOS/BuildSettings.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
attributes = {
LastSwiftUpdateCheck = 0920;
LastUpgradeCheck = 0920;
ORGANIZATIONNAME = xcodeswift;
ORGANIZATIONNAME = xcbuddy;
};
buildConfigurationList = E4966A3A1FBAFF5F00CDE63E /* Build configuration list for PBXProject "BuildSettings" */;
compatibilityVersion = "Xcode 8.0";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
attributes = {
LastSwiftUpdateCheck = 0920;
LastUpgradeCheck = 0920;
ORGANIZATIONNAME = xcodeswift;
ORGANIZATIONNAME = xcbuddy;
};
buildConfigurationList = E4C06A7F1FC1CA8500A9AB51 /* Build configuration list for PBXProject "ProjectWithoutProductsGroup" */;
compatibilityVersion = "Xcode 8.0";
Expand Down
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ gem "jazzy"
gem "semantic"
gem "colorize"
gem "cocoapods"
gem 'danger-xcodeswift', :git => "https://github.com/xcodeswift/danger", require: false
gem "git"
gem "rspec"
gem "xcpretty"
Expand Down
15 changes: 0 additions & 15 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,13 +1,3 @@
GIT
remote: https://github.com/xcodeswift/danger
revision: d5b65a1279db28f9f88b665887826aa83007915c
specs:
danger-xcodeswift (0.1.0)
danger (~> 5.5.5)
danger-changelog (~> 0.2.0)
danger-plugin-api (~> 1.0)
danger-swiftlint (~> 0.16.0)

GEM
remote: https://rubygems.org/
specs:
Expand Down Expand Up @@ -75,10 +65,6 @@ GEM
no_proxy_fix
octokit (~> 4.7)
terminal-table (~> 1)
danger-changelog (0.2.1)
danger-plugin-api (~> 1.0)
danger-plugin-api (1.0.0)
danger (> 2.0)
danger-swiftlint (0.16.0)
danger
rake (> 10)
Expand Down Expand Up @@ -172,7 +158,6 @@ DEPENDENCIES
cocoapods
colorize
danger-swiftlint
danger-xcodeswift!
git
jazzy
rake
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2017 xcode.swift
Copyright (c) from 2018 Pedro PiΓ±era BuendΓ­a

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
10 changes: 5 additions & 5 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@

import PackageDescription
let package = Package(
name: "xcproj",
name: "xcodeproj",
products: [
.library(name: "xcproj", targets: ["xcproj"]),
.library(name: "xcodeproj", targets: ["xcodeproj"]),
],
dependencies: [
.package(url: "https://github.com/kylef/PathKit.git", .upToNextMajor(from: "0.9.1")),
.package(url: "https://github.com/tadija/AEXML.git", .upToNextMajor(from: "4.3.0")),
.package(url: "https://github.com/JohnSundell/ShellOut.git", from: "2.0.0")
],
targets: [
.target(name: "xcproj",
.target(name: "xcodeproj",
dependencies: ["PathKit", "AEXML"]),
.testTarget(name: "xcprojTests", dependencies: ["xcproj"]),
.testTarget(name: "xcprojIntegrationTests", dependencies: ["xcproj", "PathKit", "ShellOut"]),
.testTarget(name: "xcodeprojTests", dependencies: ["xcodeproj"]),
.testTarget(name: "xcodeprojIntegrationTests", dependencies: ["xcodeproj", "PathKit", "ShellOut"]),
]
)
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@ Add the dependency in your `Package.swift` file:
let package = Package(
name: "myproject",
dependencies: [
.package(url: "https://github.com/xcbuddy/xcproj.git", .upToNextMajor(from: "4.2.0")),
.package(url: "https://github.com/xcbuddy/xcodeproj.git", .upToNextMajor(from: "4.2.0")),
],
targets: [
.target(
name: "myproject",
dependencies: ["xcproj"]),
dependencies: ["xcodeproj"]),
]
)

Expand All @@ -59,28 +59,28 @@ let package = Package(
Edit your `Marathonfile` and specify the dependency in there:

```bash
https://github.com/xcbuddy/xcproj.git
https://github.com/xcbuddy/xcodeproj.git
```

#### Using [CocoaPods](https://cocoapods.org)

Edit your `Podfile` and specify the dependency:

```ruby
pod "xcproj"
pod "xcodeproj"
```

#### Using [Carthage](https://github.com/carthage)

Edit your `Cartfile` and specify the dependency:

```bash
github "xcbuddy/xcproj"
github "xcbuddy/xcodeproj"
```

> Note: xcproj is only available for macOS and iOS projects.
> Note: xcodeproj is only available for macOS and iOS projects.
## How to use xcproj πŸ’
## How to use xcodeproj πŸ’

Xcode provides models that represent Xcode projects and are initialized by parsing the content from your project files. The generated models are classes that can be mutated at any time. These mutations in the models are kept in memory until they are persisted by writing them back to disk by writing either the `XcodeProj` or the `XCWorkspace` model. Modifications in your projects are usually executed in three steps:

Expand Down Expand Up @@ -117,8 +117,8 @@ You can read more about what each of these objects is for on the [following link

### Considerations
- Objects references are used to define dependencies between objects. In the future we might rather use objects references instead of the unique identifier.
- The write doesn't validate the structure of the project. It's up to the developer to validate the changes that have been done using `xcproj`.
- New versions of Xcode might introduce new models or property that are not supported by `xcproj`. If you find any, don't hesitate to [open an issue](https://github.com/xcbuddy/xcproj/issues/new) on the repository.
- The write doesn't validate the structure of the project. It's up to the developer to validate the changes that have been done using `xcodeproj`.
- New versions of Xcode might introduce new models or property that are not supported by `xcodeproj`. If you find any, don't hesitate to [open an issue](https://github.com/xcbuddy/xcodeproj/issues/new) on the repository.

## Examples

Expand Down Expand Up @@ -213,7 +213,7 @@ sourcesBuildPhase.files.append(buildFile.reference)
</details>

## Documentation πŸ“„
You can check out the documentation on the following [link](https://xcbuddy.github.io/xcproj/index.html). The documentation is automatically generated in every release by using [Jazzy](https://github.com/realm/jazzy) from [Realm](https://realm.io).
You can check out the documentation on the following [link](https://xcbuddy.github.io/xcodeproj/index.html). The documentation is automatically generated in every release by using [Jazzy](https://github.com/realm/jazzy) from [Realm](https://realm.io).

## References πŸ“š

Expand Down
6 changes: 3 additions & 3 deletions RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# Releasing xcproj
# Releasing

In this documents you'll find all the necessary steps to release a new version of `xcproj`.
In this documents you'll find all the necessary steps to release a new version of `xcodeproj`.

> Although some of the steps have been automated, there are some of them that need to be executed manually.
1. First of all, create a new release branch with the following name `release/x.x.x` where `x.x.x` is the new version that is going to be released.
2. Update the `CHANGELOG.md` adding a new entry at the top with the next version. Make sure that all the changes in the version that is about to be released are properly formatted. Commit the changes in `CHANGELOG.md`.
3. Validate the state of the project by executing `bundle exec rake ci`
4. Generate the release with `RELEASE_TYPE=minor bundle exec rake release`.
5. Create a new release on [GitHub](https://github.com/xcbuddy/xcproj) including the information from the last entry in the `CHANGELOG.md`.
5. Create a new release on [GitHub](https://github.com/xcbuddy/xcodeproj) including the information from the last entry in the `CHANGELOG.md`.
6. Rebase the `release/x.x.x` branch into `master` and push it to remote.

### Notes
Expand Down
16 changes: 8 additions & 8 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ end
def generate_docs
print "Generating docs"
sh "swift package generate-xcodeproj"
sh "jazzy --clean --sdk macosx --xcodebuild-arguments -project,xcproj.xcodeproj,-scheme,xcproj-Package --skip-undocumented"
sh "jazzy --clean --sdk macosx --xcodebuild-arguments -project,xcodeproj.xcodeproj,-scheme,xcodeproj-Package --skip-undocumented"
end

def any_git_changes?
Expand All @@ -33,20 +33,20 @@ def build
end

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

task :carthage do
build_carthage_project()
end

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

def test_swift_integration
sh "swift test --filter xcprojIntegrationTests"
sh "swift test --filter xcodeprojIntegrationTests"
end

def test_ruby
Expand All @@ -63,7 +63,7 @@ def next_version(type)
end

def bump_to_version(from, to)
spec_path = "xcproj.podspec"
spec_path = "xcodeproj.podspec"
content = File.read(spec_path)
File.open(spec_path, "w"){|f| f.write(content.sub(from.to_s, to.to_s)) }
end
Expand Down Expand Up @@ -132,11 +132,11 @@ task :deploy_to_integration do
end
end

desc "Bumps the version of xcproj. It creates a new tagged commit and archives the binary to be published with the release"
desc "Bumps the version of xcodeproj. It creates a new tagged commit and archives the binary to be published with the release"
task :release do
abort "You should specify the type (e.g. RELEASE_TYPE=minor rake task release)" unless ENV["RELEASE_TYPE"]
# abort 'Commit all your changes before starting the release' unless !any_git_changes?
print("Building xcproj")
print("Building xcodeproj")
build
print "Generating Carthage project"
generate_carthage_project()
Expand Down
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.
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.
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.
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.
2 changes: 1 addition & 1 deletion Tests/LinuxMain.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import XCTest
@testable import xcprojTests
@testable import xcodeprojTests

// testDictionaryExtras()
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Foundation
import XCTest
import PathKit
import ShellOut
import xcproj
import xcodeproj

final class OSSProjectsTests: XCTestCase {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Foundation
import XCTest
import xcproj
import xcodeproj

class BuildPhaseSpecs: XCTestCase {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Foundation
import PathKit
import XCTest
import xcproj
import xcodeproj

class DictionaryExtrasSpec: XCTestCase {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Foundation
import PathKit
import xcproj
import xcodeproj

func fixturesPath() -> Path {
return Path(#file).parent().parent().parent() + Path("Fixtures")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Foundation
import XCTest
import xcproj
import xcodeproj

final class PBXAggregateTargetSpec: XCTestCase {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Foundation
import XCTest
import xcproj
import xcodeproj

final class PBXBuildFileSpec: XCTestCase {

Expand Down
Loading

0 comments on commit ccf4b37

Please sign in to comment.