Skip to content
This repository has been archived by the owner on Sep 6, 2018. It is now read-only.

Configure CircleCI #24

Merged
merged 30 commits into from
Mar 5, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
dfa6cef
circle setup
djbe Feb 20, 2017
849d079
re-add the lint and compile steps
djbe Feb 20, 2017
68be4ee
use curl
djbe Feb 20, 2017
a19704f
Fix text diffing function + some missing lines from output files
djbe Feb 20, 2017
15e5ff2
disable cache for linting
djbe Feb 23, 2017
8a95f49
modules: ensure script fails if compilation fails
djbe Feb 23, 2017
9bbda4f
output: ensure script fails if one of the compilation tasks fails, bu…
djbe Feb 23, 2017
365e10a
lint: fail on warnings
djbe Feb 23, 2017
4cfaf83
smale namespace change
djbe Feb 23, 2017
a99b283
move swiftlint scripts into rakefile
djbe Feb 24, 2017
21050b4
split rakefile into libs per functional unit
djbe Feb 24, 2017
79c46e6
changelog entry
djbe Feb 24, 2017
85b1611
use xcrun with version select
djbe Feb 25, 2017
3951bb8
convert output compile scripts to ruby, also compile universal output…
djbe Feb 25, 2017
f234ca7
refactor ouput compile script to group outputs per file
djbe Feb 26, 2017
4f22d0c
print info about task
djbe Feb 26, 2017
99121eb
copy changes from stencilswiftkit
djbe Feb 28, 2017
0e5b506
run lint steps in xcode when not on CI
djbe Feb 28, 2017
1fc63cc
move files around to match kit repos
djbe Feb 28, 2017
70f0499
fix some missed lint issues
djbe Feb 28, 2017
d5cecdf
add changelog reset command
djbe Mar 1, 2017
33b6165
add gemfile and modify rake commands where needed
djbe Mar 1, 2017
0b582fa
enable/disable lint tasks automatically
djbe Mar 1, 2017
9696b6b
do the same for pod, spm and output
djbe Mar 1, 2017
4ff63a7
better run function parameters
djbe Mar 1, 2017
54bdd30
implement feedback
djbe Mar 2, 2017
42384c3
synchronize common files
djbe Mar 4, 2017
be24a2e
Move output compilation back into rakefile
djbe Mar 4, 2017
7101348
better output
djbe Mar 4, 2017
c8c1d60
pod update
djbe Mar 5, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ xcuserdata/
## Other
*.moved-aside
*.xcuserstate
*.xcscmblueprint

## Obj-C/Swift specific
*.hmap
Expand All @@ -35,7 +36,7 @@ playground.xcworkspace
# Swift Package Manager
#
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
# Packages/
Packages/
.build/

# CocoaPods
Expand All @@ -49,8 +50,7 @@ playground.xcworkspace
# Carthage
#
# Add this line if you want to avoid checking in source code from Carthage dependencies.
# Carthage/Checkouts

Carthage/Checkouts
Carthage/Build

# fastlane
Expand All @@ -64,3 +64,11 @@ fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots
fastlane/test_output

# Other stuff
.apitoken
.DS_Store
.idea/
bin/
Frameworks/
Rome/
17 changes: 0 additions & 17 deletions .travis.yml

This file was deleted.

4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ _None_

### Internal Changes

_None_
* Switch from Travis CI to Circle CI, clean up the Rakefile in the process.
[David Jennes](https://github.com/djbe)
[#24](https://github.com/SwiftGen/SwiftGenKit/issues/24)

## 1.0.0

Expand Down
5 changes: 5 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# frozen_string_literal: true
source 'https://rubygems.org'

gem 'cocoapods', '1.2.0'
gem 'xcpretty'
77 changes: 77 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (2.3.5)
activesupport (4.2.8)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
claide (1.0.1)
cocoapods (1.2.0)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.1, < 2.0)
cocoapods-core (= 1.2.0)
cocoapods-deintegrate (>= 1.0.1, < 2.0)
cocoapods-downloader (>= 1.1.3, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-stats (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.1.2, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored (~> 1.2)
escape (~> 0.0.4)
fourflusher (~> 2.0.1)
gh_inspector (~> 1.0)
molinillo (~> 0.5.5)
nap (~> 1.0)
ruby-macho (~> 0.2.5)
xcodeproj (>= 1.4.1, < 2.0)
cocoapods-core (1.2.0)
activesupport (>= 4.0.2, < 5)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
cocoapods-deintegrate (1.0.1)
cocoapods-downloader (1.1.3)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
cocoapods-stats (1.0.0)
cocoapods-trunk (1.1.2)
nap (>= 0.8, < 2.0)
netrc (= 0.7.8)
cocoapods-try (1.1.0)
colored (1.2)
escape (0.0.4)
fourflusher (2.0.1)
fuzzy_match (2.0.4)
gh_inspector (1.0.3)
i18n (0.8.1)
minitest (5.10.1)
molinillo (0.5.6)
nanaimo (0.2.3)
nap (1.1.0)
netrc (0.7.8)
rouge (1.11.1)
ruby-macho (0.2.6)
thread_safe (0.3.6)
tzinfo (1.2.2)
thread_safe (~> 0.1)
xcodeproj (1.4.2)
CFPropertyList (~> 2.3.3)
activesupport (>= 3)
claide (>= 1.0.1, < 2.0)
colored (~> 1.2)
nanaimo (~> 0.2.3)
xcpretty (0.2.4)
rouge (~> 1.8)

PLATFORMS
ruby

DEPENDENCIES
cocoapods (= 1.2.0)
xcpretty

BUNDLED WITH
1.13.7
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2017 AliSoftware
Copyright (c) 2017 SwiftGen

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
2 changes: 1 addition & 1 deletion Tests/Podfile → Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ platform :osx, '10.9'
use_frameworks!

def common_pods
pod 'Stencil', :git => 'https://github.com/kylef/Stencil', :inhibit_warnings => true
pod 'Stencil', :inhibit_warnings => true
pod 'StencilSwiftKit', :git => 'https://github.com/SwiftGen/StencilSwiftKit'
end

Expand Down
28 changes: 28 additions & 0 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
PODS:
- PathKit (0.8.0)
- Stencil (0.8.0):
- PathKit (~> 0.8.0)
- StencilSwiftKit (1.0.1):
- Stencil (~> 0.8.0)

DEPENDENCIES:
- Stencil
- StencilSwiftKit (from `https://github.com/SwiftGen/StencilSwiftKit`)

EXTERNAL SOURCES:
StencilSwiftKit:
:git: https://github.com/SwiftGen/StencilSwiftKit

CHECKOUT OPTIONS:
StencilSwiftKit:
:commit: 486c0c9e479654cfb2bff61b5f5d17822357923f
:git: https://github.com/SwiftGen/StencilSwiftKit

SPEC CHECKSUMS:
PathKit: dcab05d701474011aae0e40cf892298a831f63d6
Stencil: 6669684db0262e6eb316ce233e7e02d6df0a6cd9
StencilSwiftKit: fc4a0e446f0f45264d4029b9ca3b4798a6a35ebd

PODFILE CHECKSUM: 910aa7b4b6bcbe527b3b6800c8fe6bc374027140

COCOAPODS: 1.2.0

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
File renamed without changes.
Loading