SPM support, for real this time

nighthawk · Mar 2, 2022 · da2e5c4 · da2e5c4
1 parent c09d824
commit da2e5c4
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 70 deletions.
diff --git a/ASWeekSelectorView.podspec b/ASWeekSelectorView.podspec
@@ -8,9 +8,11 @@ Pod::Spec.new do |s|
   s.homepage     = "https://github.com/nighthawk/ASWeekSelectorView"
   s.license      = 'FreeBSD'
   s.author       = { "Adrian Schoenig" => "adrian@schoenig.me" }
-  # s.source       = { git: '.'}
-  s.source       = { :git => "https://github.com/nighthawk/ASWeekSelectorView.git", :tag => "v#{s.version}" }
+  s.source       = { git: '.'}
+  # s.source       = { :git => "https://github.com/nighthawk/ASWeekSelectorView.git", :tag => "v#{s.version}" }
   s.platform     = :ios, '10.0'
-  s.source_files = 'Classes/*.{h,m}'
+  s.source_files = [
+    'Sources/**/*.{h,m}'
+  ]
   s.requires_arc = true
 end
diff --git a/Example/ASWeekSelectorViewTests/ASWeekSelectorViewTests-Info.plist b/Example/ASWeekSelectorViewTests/ASWeekSelectorViewTests-Info.plist
diff --git a/Example/ASWeekSelectorViewTests/ASWeekSelectorViewTests.m b/Example/ASWeekSelectorViewTests/ASWeekSelectorViewTests.m
diff --git a/Example/ASWeekSelectorViewTests/en.lproj/InfoPlist.strings b/Example/ASWeekSelectorViewTests/en.lproj/InfoPlist.strings
diff --git a/Package.swift b/Package.swift
@@ -17,9 +17,7 @@ let package = Package(
   ],
   targets: [
     .target(
-      name: "ASWeekSelectorView",
-      dependencies: [],
-      path: "Classes"
+      name: "ASWeekSelectorView"
     ),
   ]
 )
diff --git a/README.md b/README.md
@@ -27,12 +27,6 @@ Using Cocoapods:
 pod 'ASWeekSelectorView', '~> 1.0'
 ```
 
-Using Carthage:
-
-```ruby
-github "nighthawk/ASWeekSelectorView"
-```
-
 2) Add an instance of `ASWeekSelectorView` to your view hierarchy, configure it, provide a delegate and implement the delegate smethod. (Note that you won't need to use `ASDaySelectionView` and `ASSingleWeekView` yourself - they are internal helper class.)
 
 3) When using Auto Layout, adjust the frame in `viewWillLayoutSubviews`:

diff --git a/Classes/ASDaySelectionView.h → ...s/ASWeekSelectorView/ASDaySelectionView.h b/Classes/ASDaySelectionView.h → ...s/ASWeekSelectorView/ASDaySelectionView.h
diff --git a/Classes/ASDaySelectionView.m → ...s/ASWeekSelectorView/ASDaySelectionView.m b/Classes/ASDaySelectionView.m → ...s/ASWeekSelectorView/ASDaySelectionView.m
diff --git a/Classes/ASSingleWeekView.h → ...ces/ASWeekSelectorView/ASSingleWeekView.h b/Classes/ASSingleWeekView.h → ...ces/ASWeekSelectorView/ASSingleWeekView.h
diff --git a/Classes/ASSingleWeekView.m → ...ces/ASWeekSelectorView/ASSingleWeekView.m b/Classes/ASSingleWeekView.m → ...ces/ASWeekSelectorView/ASSingleWeekView.m
diff --git a/Classes/ASWeekSelectorView.m → ...s/ASWeekSelectorView/ASWeekSelectorView.m b/Classes/ASWeekSelectorView.m → ...s/ASWeekSelectorView/ASWeekSelectorView.m
@@ -6,7 +6,11 @@
 //
 //
 
+#if SWIFT_PACKAGE
+#import <ASWeekSelectorView/ASWeekSelectorView.h>
+#else
 #import "ASWeekSelectorView.h"
+#endif
 
 #import <QuartzCore/QuartzCore.h>
 

diff --git a/Classes/ASWeekSelectorView.h → ...e/ASWeekSelectorView/ASWeekSelectorView.h b/Classes/ASWeekSelectorView.h → ...e/ASWeekSelectorView/ASWeekSelectorView.h