Merge pull request #11 from jeanetienne/reverse-spm

Reverse spm
jeanetienne · Feb 10, 2019 · cc65bfa · cc65bfa
2 parents a8ac2ef + 875ada7
commit cc65bfa
Show file tree

Hide file tree

Showing 23 changed files with 155 additions and 142 deletions.
diff --git a/AssetResizer.xcodeproj/project.pbxproj b/AssetResizer.xcodeproj/project.pbxproj
diff --git a/AssetResizer.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/AssetResizer.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/Sources/AssetResizer/AppIconSet.swift → AssetResizer/AppIconSet.swift b/Sources/AssetResizer/AppIconSet.swift → AssetResizer/AppIconSet.swift
diff --git a/AssetResizer/Info.plist b/AssetResizer/Info.plist
@@ -0,0 +1,26 @@
+<?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>en</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>0.3.0</string>
+	<key>CFBundleVersion</key>
+	<string>9</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2019 Jean-Étienne. All rights reserved.</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>
diff --git a/Sources/AssetResizer/NSImage+Resizing.swift → AssetResizer/NSImage+Resizing.swift b/Sources/AssetResizer/NSImage+Resizing.swift → AssetResizer/NSImage+Resizing.swift
diff --git a/Sources/AssetResizer/NSImage+Saving.swift → AssetResizer/NSImage+Saving.swift b/Sources/AssetResizer/NSImage+Saving.swift → AssetResizer/NSImage+Saving.swift
diff --git a/Sources/AssetResizer/ResizedImage.swift → AssetResizer/ResizedImage.swift b/Sources/AssetResizer/ResizedImage.swift → AssetResizer/ResizedImage.swift
diff --git a/...s/AssetResizerTests/AppIconSetTests.swift → AssetResizerTests/AppIconSetTests.swift b/...s/AssetResizerTests/AppIconSetTests.swift → AssetResizerTests/AppIconSetTests.swift
diff --git a/...AssetResizerTests/AssetResizerTests.swift → AssetResizerTests/AssetResizerTests.swift b/...AssetResizerTests/AssetResizerTests.swift → AssetResizerTests/AssetResizerTests.swift
diff --git a/AssetResizerTests/AssetResizerTests.swift.orig b/AssetResizerTests/AssetResizerTests.swift.orig
@@ -0,0 +1,18 @@
+//
+//  AssetResizer
+//  Copyright © 2019 Jean-Étienne. All rights reserved.
+//
+
+import XCTest
+
+@testable import AssetResizer
+
+<<<<<<< HEAD:Tests/AssetResizerTests/AssetResizerTests.swift
+final class AssetResizerTests: XCTestCase {
+
+    static let identifier = "net.jeanetienne.AssetResizerTests"
+=======
+class AssetResizerTests: XCTestCase {
+>>>>>>> parent of c22513e... Moving on to using Swift Package Manager:AssetResizerTests/AssetResizerTests.swift
+
+}
diff --git a/AssetResizerTests/Info.plist b/AssetResizerTests/Info.plist
@@ -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>en</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>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>0.3.0</string>
+	<key>CFBundleVersion</key>
+	<string>9</string>
+</dict>
+</plist>
diff --git a/...AssetResizerTests/ResizedImageTests.swift → AssetResizerTests/ResizedImageTests.swift b/...AssetResizerTests/ResizedImageTests.swift → AssetResizerTests/ResizedImageTests.swift
diff --git a/...etResizerTests/SizeDescriptionTests.swift → AssetResizerTests/SizeDescriptionTests.swift b/...etResizerTests/SizeDescriptionTests.swift → AssetResizerTests/SizeDescriptionTests.swift
diff --git a/...ssetResizerTests/Tools/Bundle+Tests.swift → AssetResizerTests/Tools/Bundle+Tests.swift b/...ssetResizerTests/Tools/Bundle+Tests.swift → AssetResizerTests/Tools/Bundle+Tests.swift
diff --git a/Tests/AssetResizerTests/Tools/TestData.swift → AssetResizerTests/Tools/TestData.swift b/Tests/AssetResizerTests/Tools/TestData.swift → AssetResizerTests/Tools/TestData.swift
diff --git a/...etResizerTests/Tools/URL+TempFolder.swift → AssetResizerTests/Tools/URL+TempFolder.swift b/...etResizerTests/Tools/URL+TempFolder.swift → AssetResizerTests/Tools/URL+TempFolder.swift
diff --git a/...ts/test-data/SampleAppIcon.appiconset.zip → ...ts/test-data/SampleAppIcon.appiconset.zip b/...ts/test-data/SampleAppIcon.appiconset.zip → ...ts/test-data/SampleAppIcon.appiconset.zip
diff --git a/...ts/test-data/iOS/sample-blue-app-icon.png → ...ts/test-data/iOS/sample-blue-app-icon.png b/...ts/test-data/iOS/sample-blue-app-icon.png → ...ts/test-data/iOS/sample-blue-app-icon.png
diff --git a/...sts/test-data/iOS/sample-red-app-icon.png → ...sts/test-data/iOS/sample-red-app-icon.png b/...sts/test-data/iOS/sample-red-app-icon.png → ...sts/test-data/iOS/sample-red-app-icon.png
diff --git a/Package.swift b/Package.swift
diff --git a/README.md b/README.md
@@ -4,6 +4,7 @@
 [![GitHub license](https://img.shields.io/badge/license-MIT-lightgrey.svg)](https://raw.githubusercontent.com/jeanetienne/AssetResizer/master/LICENSE)
 [![GitHub release](https://img.shields.io/github/release/jeanetienne/AssetResizer.svg)](https://github.com/jeanetienne/AssetResizer/releases)
 [![codecov.io](https://codecov.io/github/jeanetienne/AssetResizer/coverage.svg?branch=master&style=flat)](https://codecov.io/github/jeanetienne/AssetResizer/?branch=master)
+[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
 
 ## Create app icons based on the content of your .appiconset folder
 AssetResizer helps you read the contents of your AppIcon sets in your Xcode asset catalogs and resize your app icon accordingly.
diff --git a/Tests/AssetResizerTests/XCTestManifests.swift b/Tests/AssetResizerTests/XCTestManifests.swift
diff --git a/Tests/LinuxMain.swift b/Tests/LinuxMain.swift