Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

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

22 changes: 12 additions & 10 deletions Example/Optik.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -465,11 +465,12 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand Down Expand Up @@ -514,10 +515,11 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_VERSION = 5.0;
VALIDATE_PRODUCT = YES;
};
name = Release;
Expand All @@ -528,12 +530,12 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = Optik/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.1;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MODULE_NAME = ExampleApp;
PRODUCT_BUNDLE_IDENTIFIER = "com.prolificinteractive.Optik-Example";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -543,12 +545,12 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = Optik/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.1;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MODULE_NAME = ExampleApp;
PRODUCT_BUNDLE_IDENTIFIER = "com.prolificinteractive.Optik-Example";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand All @@ -562,11 +564,11 @@
"$(inherited)",
);
INFOPLIST_FILE = Tests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.1;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -576,11 +578,11 @@
buildSettings = {
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = Tests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.1;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand Down
12 changes: 10 additions & 2 deletions Example/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,22 @@ source 'https://github.com/CocoaPods/Specs.git'
use_frameworks!

target 'Optik_Example' do
platform :ios, '10.1'
platform :ios, '12.0'

pod 'Optik', :path => '../'
pod 'AlamofireImage', '3.5.2'
end

target 'Optik_Tests' do
platform :ios, '10.1'
platform :ios, '12.0'

pod 'Optik', :path => '../'
end

post_install do |installer|
installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
config.build_settings["IPHONEOS_DEPLOYMENT_TARGET"] = "12.0"
end
end
end
8 changes: 4 additions & 4 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ DEPENDENCIES:
- Optik (from `../`)

SPEC REPOS:
https://github.com/cocoapods/specs.git:
https://github.com/CocoaPods/specs.git:
- Alamofire
- AlamofireImage

Expand All @@ -20,8 +20,8 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
Alamofire: ae5c501addb7afdbb13687d7f2f722c78734c2d3
AlamofireImage: 63cfe3baf1370be6c498149687cf6db3e3b00999
Optik: 64066ad701b3d440bc4b3847a5f354b602e188aa
Optik: 6f5f6ab20ff6a8b7a28454eb657e9dbb3f77bfa7

PODFILE CHECKSUM: d67d5ec03568c2c450e4e08d87956e556f0b2f08
PODFILE CHECKSUM: 48ad3517f5878faa0bb923c5ab31c8c176bc9654

COCOAPODS: 1.7.1
COCOAPODS: 1.12.1
12 changes: 6 additions & 6 deletions Optik.podspec
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
Pod::Spec.new do |s|
s.name = "Optik"
s.version = "0.4.0"
s.version = "0.5.0"
s.summary = "A Swift library for displaying images from any source, local or remote."
s.description = <<-DESC
Optik provides a simple viewing experience for a set of images, whether stored locally or remotely.
DESC

s.homepage = "https://github.com/prolificinteractive/Optik"
s.homepage = "https://github.com/makeitheady/Optik"
# s.screenshots = "www.example.com/screenshots_1", "www.example.com/screenshots_2"
s.license = 'MIT'
s.author = { "htinlinn" => "linn@prolificinteractive.com" }
s.source = { :git => "https://github.com/prolificinteractive/Optik.git", :tag => s.version.to_s }
s.source = { :git => "https://github.com/makeitheady/Optik.git", :branch => "chore/swift-package" }

s.platform = :ios, '10.1'
s.platform = :ios, '12.0'
s.requires_arc = true

s.source_files = 'Optik/Classes/**/*'
s.resources = ['Optik/Assets/*.xcassets']
s.source_files = 'Sources/Optik/**/*{.swift}'
s.resources = ['Sources/Optik/Resources/*.xcassets']
end
Empty file removed Optik/Classes/.gitkeep
Empty file.
25 changes: 25 additions & 0 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// swift-tools-version: 5.10
// The swift-tools-version declares the minimum version of Swift required to build this package.

import PackageDescription

let package = Package(
name: "Optik",
defaultLocalization: "en",
platforms: [.iOS(.v12)],
products: [
// Products define the executables and libraries a package produces, making them visible to other packages.
.library(
name: "Optik",
targets: ["Optik"]),
],
targets: [
// Targets are the basic building blocks of a package, defining a module or a test suite.
// Targets can depend on other targets in this package and products from dependencies.
.target(
name: "Optik"),
.testTarget(
name: "OptikTests",
dependencies: ["Optik"]),
]
)
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
// Copyright © 2016 Prolific Interactive. All rights reserved.
//

import QuartzCore

/**
* Defines a collection of functions required for interpolating values.
*/
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
// Copyright © 2016 Prolific Interactive. All rights reserved.
//

import QuartzCore

/// RK4 integrator. Source: http://gafferongames.com/game-physics/integration-basics/
internal struct SpringIntegrator<T: Interpolatable> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
// Copyright © 2016 Prolific Interactive. All rights reserved.
//

import QuartzCore

/// 1D vector type. Internally holds a `Vector`.
internal struct Vector1D {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
// Copyright © 2016 Prolific Interactive. All rights reserved.
//

import QuartzCore

/// 4D vector type. Internally holds a `Vector`.
internal struct Vector4D {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
// Copyright © 2016 Prolific Interactive. All rights reserved.
//

import QuartzCore

/**
* A type that can be converted to and from an array of `CGFloat` and used as a `Vector` type.
*/
Expand Down
File renamed without changes.
File renamed without changes.
12 changes: 12 additions & 0 deletions Tests/OptikTests/OptikTests.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import XCTest
@testable import Optik

final class OptikTests: XCTestCase {
func testExample() throws {
// XCTest Documentation
// https://developer.apple.com/documentation/xctest

// Defining Test Cases and Test Methods
// https://developer.apple.com/documentation/xctest/defining_test_cases_and_test_methods
}
}