Merge branch '2.0-dev'

.gitignore

@@ -66,6 +66,8 @@ fastlane/Appfile
 #Preview.html
 #fastlane/screenshots
 fastlane/test_output
+fastlane/metadata/review_information
+fastlane/metadata/trade_representative_contact_information
 
 *.cer
 *.mobileprovision

.swiftlint.yml

@@ -2,6 +2,9 @@ excluded:
   - Pods
   - wallabag/Model/Server.swift
   - wallabag/Lib/CoreData.swift
+  - wallabag/Entr*.swift
+  - wallabag/Entry+CoreDataProperties.swift
+  - wallabag/Entry+CoreDataClass.swift
 line_length: 300
 variable_name:
   excluded:

.travis.yml

@@ -1,8 +1,18 @@
 language: objective-c
-osx_image: xcode8
-xcode_workspace: wallabag.xcworkspace
-xcode_scheme: wallabag
+cache: cocoapods
+matrix:
+  include:
+  - osx_image: xcode8.3
+    env: SDK="iphonesimulator10.3" DESTINATION="name=iPhone 6s,OS=9.0"
+  - osx_image: xcode8.3
+    env: SDK="iphonesimulator10.3" DESTINATION="name=iPhone 6s,OS=10.3"
+env:
+  global:
+  - WORKSPACE=wallabag.xcworkspace
+  - SCHEME=wallabag
 before_install:
+  - gem install -N cocoapods -v 1.2.0
   - pod repo update > /dev/null
 script:
-  - set -o pipefail && env "NSUnbufferedIO=YES" xcodebuild "-workspace" "wallabag.xcworkspace" "-scheme" "wallabag" "build" "test" "-destination" "platform=iOS Simulator,name=iPhone 6s Plus,OS=latest" | xcpretty
+  - set -o pipefail
+  - xcodebuild test -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" ONLY_ACTIVE_ARCH=YES | xcpretty

Podfile

@@ -2,24 +2,28 @@ source 'https://github.com/CocoaPods/Specs.git'
 platform :ios, '10.0'
 use_frameworks!
 
-
 target 'wallabag' do
-  pod 'Alamofire', '~> 4.0'
-  pod 'TUSafariActivity', '~> 1.0'
-  pod 'AlamofireNetworkActivityIndicator', '~> 2.0'
-
-  target 'wallabagTests' do
-    inherit! :search_paths
-    # Pods for testing
-  end
+    pod 'Alamofire', '~> 4.0'
+    pod 'AlamofireImage', '~> 3.1'
+    pod 'TUSafariActivity', '~> 1.0'
+    pod 'AlamofireNetworkActivityIndicator', '~> 2.0'
+    pod 'WallabagKit'
+    #pod 'WallabagKit', :path => "../WallabagKit"
+    pod 'SideMenu'
+    pod 'SwiftyBeaver'
+
+    target 'wallabagUITests' do
+        inherit! :search_paths
+        # Pods for testing
+    end
+end
 
-  target 'wallabagUITests' do
-    inherit! :search_paths
-    # Pods for testing
-  end
-
-  target 'bagit' do
-      inherit! :search_paths
-  end
+target 'bagit' do
+    pod 'WallabagKit'
+    #pod 'WallabagKit', :path => "../WallabagKit"
+end
 
+target 'wallabagTests' do
+    pod 'WallabagKit'
+    #pod 'WallabagKit', :path => "../WallabagKit"
 end

Podfile.lock

@@ -1,19 +1,33 @@
 PODS:
-  - Alamofire (4.2.0)
+  - Alamofire (4.4.0)
+  - AlamofireImage (3.2.0):
+    - Alamofire (~> 4.1)
   - AlamofireNetworkActivityIndicator (2.1.0):
     - Alamofire (~> 4.1)
+  - SideMenu (2.3.2)
+  - SwiftyBeaver (1.2.2)
   - TUSafariActivity (1.0.4)
+  - WallabagKit (0.1.2):
+    - Alamofire
 
 DEPENDENCIES:
   - Alamofire (~> 4.0)
+  - AlamofireImage (~> 3.1)
   - AlamofireNetworkActivityIndicator (~> 2.0)
+  - SideMenu
+  - SwiftyBeaver
   - TUSafariActivity (~> 1.0)
+  - WallabagKit
 
 SPEC CHECKSUMS:
-  Alamofire: aa2e09d871c9160ac53c90e83c68064a94e3dfbe
+  Alamofire: dc44b1600b800eb63da6a19039a0083d62a6a62d
+  AlamofireImage: 157ed682cc81d3b9db4fb90c1f12180ac552d93b
   AlamofireNetworkActivityIndicator: 4716f6554bdfb9c7cf13b1e0e3af21163129690a
+  SideMenu: 3fa07dd05d4bade2b6f9889fb1877e312e1ba319
+  SwiftyBeaver: 90a39e3dc5136b7285f2e4c870b107e3933b8b84
   TUSafariActivity: afc55a00965377939107ce4fdc7f951f62454546
+  WallabagKit: f6c285143adf9d4c80f3705d425c20c217e3272f
 
-PODFILE CHECKSUM: fc3fa64176eb341cabf7adf68e039bd62fd56a44
+PODFILE CHECKSUM: 6f769465ea8f6602d14e817c11be40a4f57d788b
 
 COCOAPODS: 1.2.0