Skip to content

Commit

Permalink
Merge pull request #50 from brightdigit/release/v2.0.0-alpha1
Browse files Browse the repository at this point in the history
Release/v2.0.0 alpha1
  • Loading branch information
leogdion authored Aug 4, 2018
2 parents e09f903 + a48656c commit eab259f
Show file tree
Hide file tree
Showing 1,238 changed files with 254,540 additions and 9,109 deletions.
3 changes: 0 additions & 3 deletions .codecov.yml

This file was deleted.

91 changes: 89 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@

# Created by https://www.gitignore.io/api/macos,swift,xcode,objective-c

### macOS ###
*.DS_Store
.AppleDouble
.LSOverride
Expand Down Expand Up @@ -25,6 +29,7 @@ Network Trash Folder
Temporary Items
.apdisk

### Objective-C ###
# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
Expand All @@ -38,6 +43,7 @@ Products/
# Xcode
#
build/
## Various settings
*.pbxuser
!default.pbxuser
*.mode1v3
Expand All @@ -51,13 +57,54 @@ xcuserdata/
## Other
*.moved-aside
*.xcuserstate
*.xccheckout
*.xcscmblueprint

## Obj-C/Swift specific
*.hmap
*.ipa
*.dSYM.zip
*.dSYM

# CocoaPods - Refactored to standalone file


# Carthage - Refactored to standalone file

# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://docs.fastlane.tools/best-practices/source-control/#source-control

fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots
fastlane/test_output

# Code Injection
#
# After new code Injection tools there's a generated folder /iOSInjectionProject
# https://github.com/johnno1962/injectionforxcode

iOSInjectionProject/

### Objective-C Patch ###

### Swift ###
# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

## Build generated

## Various settings

## Other

## Obj-C/Swift specific

## Playgrounds
timeline.xctimeline
playground.xcworkspace
Expand All @@ -73,22 +120,28 @@ xcuserdata
DerivedData
*.hmap
*.ipa
*.xcuserstate
*.xcuserstate

# CocoaPods
#
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
#
#Pods/
Pods/

# Carthage
#
# Add this line if you want to avoid checking in source code from Carthage dependencies.
# Carthage/Checkouts

Carthage/Build
# Package.pins
.build/

# CocoaPods - Refactored to standalone file

# Carthage - Refactored to standalone file

# fastlane
#
Expand All @@ -109,3 +162,37 @@ examples/*/*.xcassets/*/*.pdf
playgrounds

.version
# https://docs.fastlane.tools/best-practices/source-control/#source-control


### Xcode ###
# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

## Build generated

## Various settings

## Other

### Xcode Patch ###
*.xcodeproj/*
!*.xcodeproj/project.pbxproj
!*.xcodeproj/xcshareddata/
!*.xcworkspace/contents.xcworkspacedata
/*.gcno

# End of https://www.gitignore.io/api/macos,swift,xcode,objective-c

Products
*tests/*.png
*tests/*.pdf

CairoSVG.xcconfig
autorevision.json
applications/mac/assets/assets
tmp

certs/*.cer
certs/*.p12
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.3.7
5 changes: 0 additions & 5 deletions .slather.yml

This file was deleted.

5 changes: 5 additions & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
excluded: # paths to ignore during linting. Takes precedence over `included`.
- Pods
- __archive
- examples
- frameworks/speculid/Models/VCS.swift
72 changes: 48 additions & 24 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,55 @@
language: objective-c
env:
global:
- secure: hVl7EFbdJhUsIzMXOZ0BESzmcMwro5fSHoFD33xCoWF+4Ov5TtiW5iy02Z4096fbgziD5SBdNG/4y87Z0kqRPPJgcGOObfwE3VWkIYj6dIHaXXnGlmieTEMRkq4a4GOjXJFpJODkKPmMSL1NLqdxUYFmn3rvCyBEQjiRQzygTj4=
branches:
except:
- develop
- gh-pages
osx_image: xcode8.2
xcode_workspace: speculid.xcworkspace # path to your xcodeproj folder
xcode_scheme: Speculid
except:
- develop
- gh-pages
osx_image: xcode9.4
xcode_workspace: speculid.xcworkspace
xcode_scheme: Speculid-Mac-App
before_install:
- brew update
- ./brew-install homebrew/gui/inkscape
- ./brew-install imagemagick
- rvm use $RVM_RUBY_VERSION
install: bundle install --without=documentation
script:
- xcodebuild -workspace speculid.xcworkspace -scheme "Speculid Application" -derivedDataPath ./build build -configuration "Release"
- diff examples/shasum <(./shasum.sh)
- xcodebuild -workspace speculid.xcworkspace -scheme Speculid test
after_success:
- slather
- bash <(curl -s https://codecov.io/bash) -f cobertura.xml
- bundler install
- pod repo update
- pod install
script:
- "./scripts/decrypt-certs.sh"
- "./scripts/build-keychain.sh"
- xcodebuild test -workspace speculid.xcworkspace -scheme "Speculid"
- xcodebuild archive -workspace speculid.xcworkspace -scheme "Speculid-Mac-App" -configuration
Release -derivedDataPath ./build -archivePath ./build/Products/Speculid.xcarchive
- xcodebuild -exportArchive -archivePath ./build/Products/Speculid.xcarchive -exportOptionsPlist
./exportOptions.plist -exportPath ./build/Products/App
- ditto -c -k --sequesterRsrc --keepParent ./build/Products/App/Speculid.app build/Speculid.zip
- open Build/Products/App/Speculid.app
- osascript -e 'tell application "Speculid" to quit'
- diff examples/shasum <(./scripts/shasum.sh)
before_deploy:
- git config --global user.email "[email protected]"
- git config --global user.name "Travis CI"
- export GIT_TAG=v`./bin/package.sh ./build/Products/App/Speculid.app`.$TRAVIS_BUILD_NUMBER-dev
- git tag $GIT_TAG -a -m "Generated tag from TravisCI for build $TRAVIS_BUILD_NUMBER"
- git push -q https://${TRAVIS_SECURE_TOKEN_NAME}@github.com/brightdigit/speculid
--tags
deploy:
provider: releases
prerelease: true
api_key:
secure: kB1IJxdHO6n3vTU6qR4klgASWhMzZmiiKYuKppgjZ5zq/dwTma8Ls3PabZcCoo8Bb+tZVXrohLweKwqP+IjH+oydV+9qt4oh2Q6po6gS+Qj3bTMQ+KrZYc699p32JVASQsRgLkYSUQHFT1wR4R5tlGw3A+tevJFlG56tC2WV1Sw=
file: build/Speculid.zip
skip_cleanup: true
on:
tags: false
all_branches: true
after_failure:
- ./shasum.sh
- find "examples/Assets/." -type f \( -iname \*.icns -o -iname \*.png -o -iname \*.pdf \) -print0 | sort -z | xargs -0 shasum -a 512
- "./scripts/shasum.sh"
- find "examples/Assets/." -type f \( -iname \*.icns -o -iname \*.png -o -iname \*.pdf
\) -print0 | sort -z | xargs -0 shasum -a 512
notifications:
webhooks:
urls:
- https://webhooks.gitter.im/e/f596466e5c30701b566d
on_success: change # options: [always|never|change] default: always
on_failure: always # options: [always|never|change] default: always
on_start: never # options: [always|never|change] default: always
- https://webhooks.gitter.im/e/f596466e5c30701b566d
on_success: change
on_failure: always
on_start: never
1 change: 0 additions & 1 deletion CNAME

This file was deleted.

2 changes: 2 additions & 0 deletions CairoSVG.debug.xcconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#include "Pods/Target Support Files/Pods-CairoSVG/Pods-CairoSVG.debug.xcconfig"
#include "CairoSVG.xcconfig"
2 changes: 2 additions & 0 deletions CairoSVG.release.xcconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#include "Pods/Target Support Files/Pods-CairoSVG/Pods-CairoSVG.release.xcconfig"
#include "CairoSVG.xcconfig"
18 changes: 18 additions & 0 deletions CairoSVG/CarioSVG.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
//
// CarioSVG.h
// CarioSVG
//
// Created by Leo Dion on 6/28/18.
//

#import <Cocoa/Cocoa.h>

//! Project version number for CarioSVG.
FOUNDATION_EXPORT double CarioSVGVersionNumber;

//! Project version string for CarioSVG.
FOUNDATION_EXPORT const unsigned char CarioSVGVersionString[];

// In this header, you should import all the public headers of your framework using statements like #import <CarioSVG/PublicHeader.h>


17 changes: 17 additions & 0 deletions CairoSVG/ImageHandleBuilder.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
//
// ImageHandleBuilder.h
// CairoSVG
//
// Created by Leo Dion on 6/28/18.
//

#import <Foundation/Foundation.h>
#import <rsvg.h>

NS_ASSUME_NONNULL_BEGIN

@interface ImageHandleBuilder : NSObject
- (RsvgHandle *)rsvgHandleFromURL:(NSURL*) url;
@end

NS_ASSUME_NONNULL_END
20 changes: 20 additions & 0 deletions CairoSVG/ImageHandleBuilder.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
//
// ImageHandleBuilder.m
// CairoSVG
//
// Created by Leo Dion on 6/28/18.
//

#import "ImageHandleBuilder.h"
//#import "GlibError.h"

@implementation ImageHandleBuilder

- (RsvgHandle *)rsvgHandleFromURL:(NSURL*) url{
GError * gerror = nil;
RsvgHandle * rsvgHandle;
rsvgHandle = rsvg_handle_new_from_file(url.path.UTF8String , &gerror);

return rsvgHandle;
}
@end
22 changes: 22 additions & 0 deletions CairoSVG/Info.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
</dict>
</plist>
Loading

0 comments on commit eab259f

Please sign in to comment.