Merge pull request #130 from trivago/feature/project-refactor

Project refactor

.github/workflows/heimdallr.yml

@@ -0,0 +1,15 @@
+name: Heimdallr
+
+on: push
+
+jobs:
+    Build_and_Test:
+
+        runs-on: macos-latest
+
+        steps:
+        - uses: actions/checkout@v2
+        - name: Build
+          run: swift build --build-tests --disable-automatic-resolution -v
+        - name: Run tests
+          run: swift test --disable-automatic-resolution -v

.gitignore

@@ -4,6 +4,7 @@
 ## Build generated
 build/
 DerivedData
+.build
 
 ## Various settings
 *.pbxuser

.swiftpm/xcode/xcshareddata/xcschemes/Heimdallr.xcscheme

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1240"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "Heimdallr_HeimdallrTests"
+               BuildableName = "Heimdallr_HeimdallrTests"
+               BlueprintName = "Heimdallr_HeimdallrTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "Heimdallr"
+               BuildableName = "Heimdallr"
+               BlueprintName = "Heimdallr"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "HeimdallrTests"
+               BuildableName = "HeimdallrTests"
+               BlueprintName = "HeimdallrTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "HeimdallrTests"
+               BuildableName = "HeimdallrTests"
+               BlueprintName = "HeimdallrTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "Heimdallr_HeimdallrTests"
+            BuildableName = "Heimdallr_HeimdallrTests"
+            BlueprintName = "Heimdallr_HeimdallrTests"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

CONTRIBUTING.md

@@ -1,9 +1,7 @@
 You're interested in contributing to this project, that's awesome!
 
-## Dependencies
+The Xcode project is only included to support Carthage. You can still edit the files from the included Xcode project, but it does not include the tests, so it is recommended to open the root folder directly in Xcode so that it can recognize it as a Swift Package and allow running the tests.
 
-We are using [Carthage](https://github.com/Carthage/Carthage) to manage dependencies without relying on it at build-time by integrating dependencies as Git Submodules. If you want to update a dependency, please change the corresponding `Cartfile` and run:
+## Dependencies
 
-```sh
-carthage update --use-submodules --no-build <dependency>
-```
+There is only one dependency in the project, which is [OHHTTPStubs](https://github.com/AliSoftware/OHHTTPStubs). This is only used for testing.

Heimdallr.podspec

@@ -1,31 +1,25 @@
 Pod::Spec.new do |spec|
-  spec.name = 'Heimdallr'
-  spec.version = '3.7.0'
+  spec.name = "Heimdallr"
+  spec.version = "4.0.0"
   spec.authors = {
-    'trivago' => '[email protected]'
+    "trivago" => "[email protected]"
   }
-  spec.social_media_url = 'https://twitter.com/trivago'
+  spec.social_media_url = "https://twitter.com/trivago"
   spec.license = {
-    :type => 'Apache License, Version 2.0',
-    :file => 'LICENSE'
+    :type => "Apache License, Version 2.0",
+    :file => "LICENSE"
   }
-  spec.homepage = 'https://github.com/trivago/Heimdallr.swift'
+  spec.homepage = "https://github.com/trivago/Heimdallr.swift"
   spec.source = {
-    :git => 'https://github.com/trivago/Heimdallr.swift.git',
+    :git => "https://github.com/trivago/Heimdallr.swift.git",
     :tag => spec.version.to_s
   }
-  spec.summary = 'Easy to use OAuth 2 library, written in Swift'
-  spec.description = 'Heimdallr is an OAuth 2.0 client specifically designed for easy usage. It currently supports the resource owner password credentials grant flow, refreshing an access token as well as extension grants.'
+
+  spec.summary = "Easy to use OAuth 2 library, written in Swift"
+  spec.description = "Heimdallr is an OAuth 2.0 client specifically designed for easy usage. It currently supports the resource owner password credentials grant flow, refreshing an access token as well as extension grants."
 
-  spec.ios.deployment_target = '9.0'
-  spec.osx.deployment_target = '10.10'
-  spec.swift_version = '5.0'
-
-  spec.default_subspec = 'Core'
-
-  spec.subspec 'Core' do |subspec|
-    subspec.framework = 'Foundation'
-
-    subspec.source_files = 'Heimdallr/*.swift'
-  end
+  spec.platforms = { :ios => "11.0", :osx => "10.10" }
+  spec.swift_version = "5.3"
+
+  spec.source_files = "Sources/Heimdallr/*.swift"
 end