Restructure project, bring in libcmark_gfm as a dependency instead of…

… including in project directly, add support for Swift Package Manager. Update tests to include example markdown directly instead of bundled files (to allow tests to run with Swift PM).
KristopherGBaker · Dec 24, 2017 · e80de22 · e80de22
1 parent 1a6a3a9
commit e80de22
Show file tree

Hide file tree

Showing 174 changed files with 1,394 additions and 39,856 deletions.
diff --git a/.gitignore b/.gitignore
@@ -65,3 +65,4 @@ fastlane/report.xml
 fastlane/Preview.html
 fastlane/screenshots
 fastlane/test_output
+Package.resolved
diff --git a/Maaku.podspec b/Maaku.podspec
@@ -22,18 +22,17 @@ Pod::Spec.new do |s|
   s.default_subspec = 'Core'
 
   s.subspec 'CMark' do |core|
-      core.source_files = "Maaku/CMark/**/*.swift", "Maaku/libcmark/**/*{.c,.h}"
-      core.preserve_paths = "Maaku/libcmark/**/*"
-      core.pod_target_xcconfig = { "SWIFT_INCLUDE_PATHS" => "$(PODS_TARGET_SRCROOT)/Maaku/libcmark/**", "LIBRARY_SEARCH_PATHS" => "$(PODS_TARGET_SRCROOT)/Maaku/" }
+      core.source_files = "Sources/Maaku/CMark/**/*.swift"
+      core.dependency 'libcmark_gfm'
   end
 
   s.subspec 'Core' do |md|
-      md.source_files = "Maaku/Core/**/*.swift"
+      md.source_files = "Sources/Maaku/Core/**/*.swift"
       md.dependency 'Maaku/CMark'
   end
 
   s.subspec 'Plugins' do |plugins|
-      plugins.source_files = "Maaku/Plugins/**/*.swift"
+      plugins.source_files = "Sources/Maaku/Plugins/**/*.swift"
       plugins.dependency 'Maaku/CMark'
       plugins.dependency 'Maaku/Core'
   end

diff --git a/Maaku.xcodeproj/project.pbxproj b/Maaku.xcodeproj/project.pbxproj
diff --git a/Maaku/Maaku.h b/Maaku/Maaku.h
diff --git a/Maaku/libcmark/libcmark_gfm/arena.c b/Maaku/libcmark/libcmark_gfm/arena.c