Skip to content

Commit

Permalink
Merge branch 'release/2.0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
bbriatte committed Aug 23, 2017
2 parents ede165e + 71223f8 commit 79132f6
Show file tree
Hide file tree
Showing 77 changed files with 571 additions and 565 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.

---

## [2.0.2](https://github.com/Digipolitan/dependency-injector-swift/releases/tag/v2.0.2)

Renaming pod

---

## [2.0.1](https://github.com/Digipolitan/dependency-injector-swift/releases/tag/v2.0.1)

Fix module error with equatable
Expand Down
22 changes: 0 additions & 22 deletions DGDependencyInjector.xcworkspace/contents.xcworkspacedata

This file was deleted.

4 changes: 2 additions & 2 deletions DGDependencyInjector.podspec → DependencyInjector.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "DGDependencyInjector"
s.version = "2.0.1"
s.name = "DependencyInjector"
s.version = "2.0.2"
s.summary = "Dependency injector made in pure swift"
s.homepage = "https://github.com/Digipolitan/dependency-injector-swift"
s.license = { :type => "BSD", :file => "LICENSE" }
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A3169E0B1DE072C700BABAFD"
BuildableName = "DGDependencyInjector.framework"
BlueprintName = "DGDependencyInjector-OSX"
ReferencedContainer = "container:DGDependencyInjector.xcodeproj">
BuildableName = "DependencyInjector.framework"
BlueprintName = "DependencyInjector-OSX"
ReferencedContainer = "container:DependencyInjector.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
Expand All @@ -33,19 +33,19 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A3169E131DE072C800BABAFD"
BuildableName = "DGDependencyInjectorTests-OSX.xctest"
BlueprintName = "DGDependencyInjectorTests-OSX"
ReferencedContainer = "container:DGDependencyInjector.xcodeproj">
BuildableName = "DependencyInjectorTests-OSX.xctest"
BlueprintName = "DependencyInjectorTests-OSX"
ReferencedContainer = "container:DependencyInjector.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A3169E0B1DE072C700BABAFD"
BuildableName = "DGDependencyInjector.framework"
BlueprintName = "DGDependencyInjector-OSX"
ReferencedContainer = "container:DGDependencyInjector.xcodeproj">
BuildableName = "DependencyInjector.framework"
BlueprintName = "DependencyInjector-OSX"
ReferencedContainer = "container:DependencyInjector.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
Expand All @@ -65,9 +65,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A3169E0B1DE072C700BABAFD"
BuildableName = "DGDependencyInjector.framework"
BlueprintName = "DGDependencyInjector-OSX"
ReferencedContainer = "container:DGDependencyInjector.xcodeproj">
BuildableName = "DependencyInjector.framework"
BlueprintName = "DependencyInjector-OSX"
ReferencedContainer = "container:DependencyInjector.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
Expand All @@ -83,9 +83,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A3169E0B1DE072C700BABAFD"
BuildableName = "DGDependencyInjector.framework"
BlueprintName = "DGDependencyInjector-OSX"
ReferencedContainer = "container:DGDependencyInjector.xcodeproj">
BuildableName = "DependencyInjector.framework"
BlueprintName = "DependencyInjector-OSX"
ReferencedContainer = "container:DependencyInjector.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A3169DAF1DE05E8300BABAFD"
BuildableName = "DGDependencyInjector.framework"
BlueprintName = "DGDependencyInjector-iOS"
ReferencedContainer = "container:DGDependencyInjector.xcodeproj">
BuildableName = "DependencyInjector.framework"
BlueprintName = "DependencyInjector-iOS"
ReferencedContainer = "container:DependencyInjector.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
Expand All @@ -34,19 +34,19 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A3169DB81DE05E8300BABAFD"
BuildableName = "DGDependencyInjectorTests-iOS.xctest"
BlueprintName = "DGDependencyInjectorTests-iOS"
ReferencedContainer = "container:DGDependencyInjector.xcodeproj">
BuildableName = "DependencyInjectorTests-iOS.xctest"
BlueprintName = "DependencyInjectorTests-iOS"
ReferencedContainer = "container:DependencyInjector.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A3169DAF1DE05E8300BABAFD"
BuildableName = "DGDependencyInjector.framework"
BlueprintName = "DGDependencyInjector-iOS"
ReferencedContainer = "container:DGDependencyInjector.xcodeproj">
BuildableName = "DependencyInjector.framework"
BlueprintName = "DependencyInjector-iOS"
ReferencedContainer = "container:DependencyInjector.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
Expand All @@ -66,9 +66,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A3169DAF1DE05E8300BABAFD"
BuildableName = "DGDependencyInjector.framework"
BlueprintName = "DGDependencyInjector-iOS"
ReferencedContainer = "container:DGDependencyInjector.xcodeproj">
BuildableName = "DependencyInjector.framework"
BlueprintName = "DependencyInjector-iOS"
ReferencedContainer = "container:DependencyInjector.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
Expand All @@ -84,9 +84,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A3169DAF1DE05E8300BABAFD"
BuildableName = "DGDependencyInjector.framework"
BlueprintName = "DGDependencyInjector-iOS"
ReferencedContainer = "container:DGDependencyInjector.xcodeproj">
BuildableName = "DependencyInjector.framework"
BlueprintName = "DependencyInjector-iOS"
ReferencedContainer = "container:DependencyInjector.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A3169DEE1DE0718900BABAFD"
BuildableName = "DGDependencyInjector.framework"
BlueprintName = "DGDependencyInjector-tvOS"
ReferencedContainer = "container:DGDependencyInjector.xcodeproj">
BuildableName = "DependencyInjector.framework"
BlueprintName = "DependencyInjector-tvOS"
ReferencedContainer = "container:DependencyInjector.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
Expand All @@ -33,19 +33,19 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A3169DF61DE0718900BABAFD"
BuildableName = "DGDependencyInjectorTests-tvOS.xctest"
BlueprintName = "DGDependencyInjectorTests-tvOS"
ReferencedContainer = "container:DGDependencyInjector.xcodeproj">
BuildableName = "DependencyInjectorTests-tvOS.xctest"
BlueprintName = "DependencyInjectorTests-tvOS"
ReferencedContainer = "container:DependencyInjector.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A3169DEE1DE0718900BABAFD"
BuildableName = "DGDependencyInjector.framework"
BlueprintName = "DGDependencyInjector-tvOS"
ReferencedContainer = "container:DGDependencyInjector.xcodeproj">
BuildableName = "DependencyInjector.framework"
BlueprintName = "DependencyInjector-tvOS"
ReferencedContainer = "container:DependencyInjector.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
Expand All @@ -65,9 +65,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A3169DEE1DE0718900BABAFD"
BuildableName = "DGDependencyInjector.framework"
BlueprintName = "DGDependencyInjector-tvOS"
ReferencedContainer = "container:DGDependencyInjector.xcodeproj">
BuildableName = "DependencyInjector.framework"
BlueprintName = "DependencyInjector-tvOS"
ReferencedContainer = "container:DependencyInjector.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
Expand All @@ -83,9 +83,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A3169DEE1DE0718900BABAFD"
BuildableName = "DGDependencyInjector.framework"
BlueprintName = "DGDependencyInjector-tvOS"
ReferencedContainer = "container:DGDependencyInjector.xcodeproj">
BuildableName = "DependencyInjector.framework"
BlueprintName = "DependencyInjector-tvOS"
ReferencedContainer = "container:DependencyInjector.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A3169DDD1DE06EF400BABAFD"
BuildableName = "DGDependencyInjector.framework"
BlueprintName = "DGDependencyInjector-watchOS"
ReferencedContainer = "container:DGDependencyInjector.xcodeproj">
BuildableName = "DependencyInjector.framework"
BlueprintName = "DependencyInjector-watchOS"
ReferencedContainer = "container:DependencyInjector.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
Expand Down Expand Up @@ -46,9 +46,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A3169DDD1DE06EF400BABAFD"
BuildableName = "DGDependencyInjector.framework"
BlueprintName = "DGDependencyInjector-watchOS"
ReferencedContainer = "container:DGDependencyInjector.xcodeproj">
BuildableName = "DependencyInjector.framework"
BlueprintName = "DependencyInjector-watchOS"
ReferencedContainer = "container:DependencyInjector.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
Expand All @@ -64,9 +64,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A3169DDD1DE06EF400BABAFD"
BuildableName = "DGDependencyInjector.framework"
BlueprintName = "DGDependencyInjector-watchOS"
ReferencedContainer = "container:DGDependencyInjector.xcodeproj">
BuildableName = "DependencyInjector.framework"
BlueprintName = "DependencyInjector-watchOS"
ReferencedContainer = "container:DependencyInjector.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
Expand Down
22 changes: 22 additions & 0 deletions DependencyInjector.xcworkspace/contents.xcworkspacedata

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

2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import PackageDescription

let package = Package(
name: "DGDependencyInjector",
name: "DependencyInjector",
dependencies: [
]
)
34 changes: 17 additions & 17 deletions Podfile
Original file line number Diff line number Diff line change
@@ -1,67 +1,67 @@
workspace 'DGDependencyInjector.xcworkspace'
workspace 'DependencyInjector.xcworkspace'

## Frameworks targets
abstract_target 'Frameworks' do
use_frameworks!
target 'DGDependencyInjector-iOS' do
target 'DependencyInjector-iOS' do
platform :ios, '8.0'
end

target 'DGDependencyInjector-watchOS' do
target 'DependencyInjector-watchOS' do
platform :watchos, '2.0'
end

target 'DGDependencyInjector-tvOS' do
target 'DependencyInjector-tvOS' do
platform :tvos, '9.0'
end

target 'DGDependencyInjector-OSX' do
target 'DependencyInjector-OSX' do
platform :osx, '10.9'
end
end

## Tests targets
abstract_target 'Tests' do
use_frameworks!
target 'DGDependencyInjectorTests-iOS' do
target 'DependencyInjectorTests-iOS' do
platform :ios, '8.0'
end

target 'DGDependencyInjectorTests-tvOS' do
target 'DependencyInjectorTests-tvOS' do
platform :tvos, '9.0'
end

target 'DGDependencyInjectorTests-OSX' do
target 'DependencyInjectorTests-OSX' do
platform :osx, '10.9'
end
end

## Samples targets
abstract_target 'Samples' do
use_frameworks!
target 'DGDependencyInjectorSample-iOS' do
project 'Samples/DGDependencyInjectorSample-iOS/DGDependencyInjectorSample-iOS'
target 'DependencyInjectorSample-iOS' do
project 'Samples/DependencyInjectorSample-iOS/DependencyInjectorSample-iOS'
platform :ios, '8.0'
end

abstract_target 'watchOS' do
project 'Samples/DGDependencyInjectorSample-watchOS/DGDependencyInjectorSample-watchOS'
target 'DGDependencyInjectorSample-watchOS' do
project 'Samples/DependencyInjectorSample-watchOS/DependencyInjectorSample-watchOS'
target 'DependencyInjectorSample-watchOS' do
platform :ios, '8.0'
end

target 'DGDependencyInjectorSample-watchOS WatchKit Extension' do
target 'DependencyInjectorSample-watchOS WatchKit Extension' do
platform :watchos, '2.0'
end
end

target 'DGDependencyInjectorSample-tvOS' do
project 'Samples/DGDependencyInjectorSample-tvOS/DGDependencyInjectorSample-tvOS'
target 'DependencyInjectorSample-tvOS' do
project 'Samples/DependencyInjectorSample-tvOS/DependencyInjectorSample-tvOS'
platform :tvos, '9.0'
end

target 'DGDependencyInjectorSample-OSX' do
project 'Samples/DGDependencyInjectorSample-OSX/DGDependencyInjectorSample-OSX'
target 'DependencyInjectorSample-OSX' do
project 'Samples/DependencyInjectorSample-OSX/DependencyInjectorSample-OSX'
platform :osx, '10.9'
end
end
Loading

0 comments on commit 79132f6

Please sign in to comment.