Skip to content

Commit

Permalink
Add support for Eureka 5.0+ (#62)
Browse files Browse the repository at this point in the history
  • Loading branch information
AndrewBennet authored and mats-claassen committed Apr 3, 2019
1 parent 6ae9c08 commit 296d79b
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 33 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
language: objective-c
osx_image: xcode10
osx_image: xcode10.2
env:
- DESTINATION="OS=12.0,name=iPhone 8" SCHEME="ImageRow" SDK=iphonesimulator
- DESTINATION="OS=12.2,name=iPhone 8" SCHEME="ImageRow" SDK=iphonesimulator

before_install:
- brew update
- brew outdated carthage || brew upgrade carthage
- carthage update --platform iOS
- gem install xcpretty --no-rdoc --no-ri --no-document --quiet
- gem install xcpretty --no-document --quiet

script:
- xcodebuild clean build -project ImageRow.xcodeproj -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO test | xcpretty -c
Expand Down
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "xmartlabs/Eureka" ~> 4.0
github "xmartlabs/Eureka" ~> 5.0
6 changes: 3 additions & 3 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
github "Quick/Nimble" "v7.3.1"
github "Quick/Quick" "v1.3.2"
github "xmartlabs/Eureka" "4.3.1"
github "Quick/Nimble" "v8.0.1"
github "Quick/Quick" "v2.0.0"
github "xmartlabs/Eureka" "5.0.0"
2 changes: 1 addition & 1 deletion Example/Example.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@
};
buildConfigurationList = 28F828C71C4B714D00330CF4 /* Build configuration list for PBXProject "Example" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Expand Down
8 changes: 4 additions & 4 deletions ImageRow.podspec
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
Pod::Spec.new do |s|
s.name = "ImageRow"
s.version = "3.2.0"
s.version = "4.0.0"
s.summary = "Eureka row that allows us to take or select a picture."
s.homepage = "https://github.com/EurekaCommunity/ImageRow"
s.license = { type: 'MIT', file: 'LICENSE' }
s.author = { "Xmartlabs SRL" => "[email protected]" }
s.source = { git: "https://github.com/EurekaCommunity/ImageRow.git", tag: s.version.to_s }
s.social_media_url = 'https://twitter.com/EurekaCommunity'
s.ios.deployment_target = '9.0'
s.ios.deployment_target = '9.3'
s.requires_arc = true
s.ios.source_files = 'Sources/**/*.{swift}'
s.dependency 'Eureka', '~> 4.3'
s.swift_version = "4.2"
s.dependency 'Eureka', '~> 5.0'
s.swift_version = "5.0"
end
22 changes: 9 additions & 13 deletions ImageRow.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -172,17 +172,17 @@
TargetAttributes = {
28F8287C1C494B2C00330CF4 = {
CreatedOnToolsVersion = 7.2;
LastSwiftMigration = 0900;
LastSwiftMigration = 1020;
};
28F828861C494B2C00330CF4 = {
CreatedOnToolsVersion = 7.2;
LastSwiftMigration = 0900;
LastSwiftMigration = 1020;
};
};
};
buildConfigurationList = 28F828771C494B2C00330CF4 /* Build configuration list for PBXProject "ImageRow" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Expand Down Expand Up @@ -292,7 +292,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -344,7 +344,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
Expand Down Expand Up @@ -375,8 +375,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -399,8 +398,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.ImageRow;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand All @@ -418,8 +416,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.ImageRowTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -436,8 +433,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.ImageRowTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ You must add the **NSPhotoLibraryUsageDescription** and **NSCameraUsageDescript

## Requirements

* iOS 9.0+
* Xcode 9.0+
* Eureka ~> 4.0
* iOS 9.3+
* Xcode 10.2+
* Eureka ~> 5.0

## Getting involved

Expand All @@ -89,7 +89,7 @@ You can also experiment and learn with the *ImageRow Playground* which is contai
To install ImageRow, simply add the following line to your Podfile:

```ruby
pod 'ImageRow', '~> 3.0'
pod 'ImageRow', '~> 4.0'
```

#### Carthage
Expand All @@ -99,7 +99,7 @@ pod 'ImageRow', '~> 3.0'
To install ImageRow, simply add the following line to your Cartfile:

```ogdl
github "EurekaCommunity/ImageRow" ~> 3.0
github "EurekaCommunity/ImageRow" ~> 4.0
```

## Customization
Expand Down
6 changes: 3 additions & 3 deletions Tests/ImageRowTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ class ImageRowTests: XCTestCase {
}

func testImagePickerControllerSourceTypeRawValue() {
XCTAssert(UIImagePickerControllerSourceType.photoLibrary.rawValue == ImageRowSourceTypes.PhotoLibrary.imagePickerControllerSourceTypeRawValue)
XCTAssert(UIImagePickerControllerSourceType.camera.rawValue == ImageRowSourceTypes.Camera.imagePickerControllerSourceTypeRawValue)
XCTAssert(UIImagePickerControllerSourceType.savedPhotosAlbum.rawValue == ImageRowSourceTypes.SavedPhotosAlbum.imagePickerControllerSourceTypeRawValue)
XCTAssert(UIImagePickerController.SourceType.photoLibrary.rawValue == ImageRowSourceTypes.PhotoLibrary.imagePickerControllerSourceTypeRawValue)
XCTAssert(UIImagePickerController.SourceType.camera.rawValue == ImageRowSourceTypes.Camera.imagePickerControllerSourceTypeRawValue)
XCTAssert(UIImagePickerController.SourceType.savedPhotosAlbum.rawValue == ImageRowSourceTypes.SavedPhotosAlbum.imagePickerControllerSourceTypeRawValue)
}

func testImageRow() {
Expand Down

0 comments on commit 296d79b

Please sign in to comment.