🔥 Remove AlamofireImage

AckeeCZ · Mar 13, 2024 · d05c87e · d05c87e
1 parent c8b5245
commit d05c87e
Show file tree

Hide file tree

Showing 11 changed files with 54 additions and 617 deletions.
diff --git a/ACKReactiveExtensions.xcodeproj/project.pbxproj b/ACKReactiveExtensions.xcodeproj/project.pbxproj
diff --git a/...tensions.xcodeproj/xcshareddata/xcschemes/ACKReactiveExtensions - AlamofireImage.xcscheme b/...tensions.xcodeproj/xcshareddata/xcschemes/ACKReactiveExtensions - AlamofireImage.xcscheme
diff --git a/ACKReactiveExtensions/AlamofireImage/Supporting files/AlamofireImage.h b/ACKReactiveExtensions/AlamofireImage/Supporting files/AlamofireImage.h
diff --git a/ACKReactiveExtensions/AlamofireImage/Supporting files/Info.plist b/ACKReactiveExtensions/AlamofireImage/Supporting files/Info.plist
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
 
 ## master
 
+- remove AlamofireImage extensions, moved to [Deprecated/AlamofireImage] for users relying on it (#62, kudos to @olejnjak)
 - use Xcode 15.2 on CI ➡️ bump deployment target to iOS 12 (#61, kudos to @olejnjak)
 
 # 6.2.0

diff --git a/Cartfile b/Cartfile
@@ -1,3 +1,2 @@
 github "ReactiveCocoa/ReactiveCocoa" ~> 12.0
 github "ReactiveCocoa/ReactiveSwift" ~> 7.0
-github "Alamofire/AlamofireImage" ~> 4.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,4 +1,2 @@
-github "Alamofire/Alamofire" "5.6.4"
-github "Alamofire/AlamofireImage" "4.2.0"
 github "ReactiveCocoa/ReactiveCocoa" "12.0.0"
-github "ReactiveCocoa/ReactiveSwift" "7.0.0"
+github "ReactiveCocoa/ReactiveSwift" "7.1.1"
diff --git a/...ofireImage/AlamofireImageExtensions.swift → ...ofireImage/AlamofireImageExtensions.swift b/...ofireImage/AlamofireImageExtensions.swift → ...ofireImage/AlamofireImageExtensions.swift
diff --git a/...fireImage/ImageDownloaderExtensions.swift → ...fireImage/ImageDownloaderExtensions.swift b/...fireImage/ImageDownloaderExtensions.swift → ...fireImage/ImageDownloaderExtensions.swift
diff --git a/Package.resolved b/Package.resolved
@@ -1,24 +1,6 @@
 {
   "object": {
     "pins": [
-      {
-        "package": "Alamofire",
-        "repositoryURL": "https://github.com/Alamofire/Alamofire.git",
-        "state": {
-          "branch": null,
-          "revision": "78424be314842833c04bc3bef5b72e85fff99204",
-          "version": "5.6.4"
-        }
-      },
-      {
-        "package": "AlamofireImage",
-        "repositoryURL": "https://github.com/Alamofire/AlamofireImage",
-        "state": {
-          "branch": null,
-          "revision": "98cbb00ce0ec5fc8e52a5b50a6bfc08d3e5aee10",
-          "version": "4.2.0"
-        }
-      },
       {
         "package": "ReactiveCocoa",
         "repositoryURL": "https://github.com/ReactiveCocoa/ReactiveCocoa",

diff --git a/Package.swift b/Package.swift
@@ -7,25 +7,62 @@ let package = Package(
         .iOS(.v12),
     ],
     products: [
-        .library(name: "ACKReactiveExtensionsCore", targets: ["ACKReactiveExtensionsCore"]),
-        .library(name: "ACKReactiveExtensionsUIKit", targets: ["ACKReactiveExtensionsUIKit"]),
-        .library(name: "ACKReactiveExtensionsWebKit", targets: ["ACKReactiveExtensionsWebKit"]),
-        .library(name: "ACKReactiveExtensionsAlamofireImage", targets: ["ACKReactiveExtensionsAlamofireImage"]),
+        .library(
+            name: "ACKReactiveExtensionsCore",
+            targets: ["ACKReactiveExtensionsCore"]
+        ),
+        .library(
+            name: "ACKReactiveExtensionsUIKit",
+            targets: ["ACKReactiveExtensionsUIKit"]
+        ),
+        .library(
+            name: "ACKReactiveExtensionsWebKit",
+            targets: ["ACKReactiveExtensionsWebKit"]
+        ),
     ],
     dependencies: [
-        .package(url: "https://github.com/Alamofire/AlamofireImage", .upToNextMajor(from: "4.0.0")),
-        .package(url: "https://github.com/ReactiveCocoa/ReactiveCocoa", .upToNextMajor(from: "12.0.0")),
-        .package(url: "https://github.com/ReactiveCocoa/ReactiveSwift", .upToNextMajor(from: "7.0.0")),
+        .package(
+            url: "https://github.com/ReactiveCocoa/ReactiveCocoa",
+            .upToNextMajor(
+                from: "12.0.0"
+            )
+        ),
+        .package(
+            url: "https://github.com/ReactiveCocoa/ReactiveSwift",
+            .upToNextMajor(
+                from: "7.0.0"
+            )
+        ),
     ],
     targets: [
-        .target(name: "ACKReactiveExtensionsAlamofireImage", dependencies: [
-            .target(name: "ACKReactiveExtensionsCore"),
-            .product(name: "AlamofireImage", package: "AlamofireImage")], path: "ACKReactiveExtensions/AlamofireImage"),
-        .target(name: "ACKReactiveExtensionsCore", dependencies: [
-            .product(name: "ReactiveSwift", package: "ReactiveSwift"),
-            .product(name: "ReactiveCocoa", package: "ReactiveCocoa")], path: "ACKReactiveExtensions/Core"),
-        .target(name: "ACKReactiveExtensionsUIKit", dependencies: [.target(name: "ACKReactiveExtensionsCore")], path: "ACKReactiveExtensions/UIKit"),
-        .target(name: "ACKReactiveExtensionsWebKit", dependencies: [.target(name: "ACKReactiveExtensionsCore")], path: "ACKReactiveExtensions/WebKit"),
+        .target(
+            name: "ACKReactiveExtensionsCore",
+            dependencies: [
+                .product(
+                    name: "ReactiveSwift",
+                    package: "ReactiveSwift"
+                ),
+                .product(
+                    name: "ReactiveCocoa",
+                    package: "ReactiveCocoa"
+                )
+            ],
+            path: "ACKReactiveExtensions/Core"
+        ),
+        .target(
+            name: "ACKReactiveExtensionsUIKit",
+            dependencies: [
+                "ACKReactiveExtensionsCore"
+            ],
+            path: "ACKReactiveExtensions/UIKit"
+        ),
+        .target(
+            name: "ACKReactiveExtensionsWebKit",
+            dependencies: [
+                "ACKReactiveExtensionsCore"
+            ],
+            path: "ACKReactiveExtensions/WebKit"
+        ),
     ],
     swiftLanguageVersions: [
         .v5
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ @@
     ## master
+    - remove AlamofireImage extensions, moved to [Deprecated/AlamofireImage] for users relying on it (#62, kudos to @olejnjak)
     - use Xcode 15.2 on CI ➡️ bump deployment target to iOS 12 (#61, kudos to @olejnjak)
     # 6.2.0
@@ Expand Down @@