Merge pull request #92 from Ethenyl/release/release-0.3.3

Release 0.3.3

Author: damien-rivet

.travis.yml

@@ -1,6 +1,6 @@
 os: osx
 language: objective-c
-osx_image: xcode10
+osx_image: xcode10.2
 
 env:
   global:

JAMFKit.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "JAMFKit"
-  s.version      = "0.3.2"
+  s.version      = "0.3.3"
   s.summary      = "A JSS communication framework written in Swift"
   s.description  = <<-DESC
     JamfKit is an iOS / macOS / tvOS framework to communicate with the JSS API offered by any Jamf host. 
@@ -12,6 +12,7 @@ Pod::Spec.new do |s|
 
   s.ios.deployment_target = "9.0"
   s.osx.deployment_target = "10.10"
+  s.tvos.deployment_target = "9.0"
 
   s.source       = { :git => "https://github.com/Ethenyl/JamfKit.git", :tag => s.version.to_s }
   s.source_files  = "JamfKit/Sources/**/*.swift"

JamfKit/Configs/JamfKit.plist JamfKit/Configurations/JamfKit.plist

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -34,7 +34,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "52D6D9851BEFF229002C0205"
-               BuildableName = "JamfKit-iOS Tests.xctest"
+               BuildableName = "JamfKit Tests.xctest"
                BlueprintName = "JamfKit-iOS Tests"
                ReferencedContainer = "container:JamfKit.xcodeproj">
             </BuildableReference>

JamfKit/Configs/JamfKitTests.plist JamfKit/Configurations/JamfKitTests.plist

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -34,7 +34,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "DD7502791C68FCFC006590AF"
-               BuildableName = "JamfKit-macOS Tests.xctest"
+               BuildableName = "JamfKit Tests.xctest"
                BlueprintName = "JamfKit-macOS Tests"
                ReferencedContainer = "container:JamfKit.xcodeproj">
             </BuildableReference>

JamfKit/JamfKit.xcodeproj/project.pbxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -34,7 +34,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "ED76B3EE204B0F7E0085C14C"
-               BuildableName = "JamfKit-tvOS Tests.xctest"
+               BuildableName = "JamfKit Tests.xctest"
                BlueprintName = "JamfKit-tvOS Tests"
                ReferencedContainer = "container:JamfKit.xcodeproj">
             </BuildableReference>

JamfKit/JamfKit.xcodeproj/xcshareddata/xcschemes/JamfKit iOS.xcscheme

@@ -10,6 +10,65 @@ public final class Building: BaseObject, Endpoint {
     // MARK: - Constants
 
     public static let Endpoint = "buildings"
+
+    static let StreetAddress1Key = "streetAddress1"
+    static let StreetAddress2Key = "streetAddress2"
+    static let CityKey = "city"
+    static let StateProvinceKey = "stateProvince"
+    static let ZipPostalCodeKey = "zipPostalCode"
+    static let CountryKey = "country"
+
+    // MARK: - Properties
+
+    @objc
+    public var streetAddress1 = ""
+
+    @objc
+    public var streetAddress2 = ""
+
+    @objc
+    public var city = ""
+
+    @objc
+    public var stateProvince = ""
+
+    @objc
+    public var zipPostalCode = ""
+
+    @objc
+    public var country = ""
+
+    // MARK: - Initialization
+
+    public required init?(json: [String: Any], node: String = "") {
+        streetAddress1 = json[Building.StreetAddress1Key] as? String ?? ""
+        streetAddress2 = json[Building.StreetAddress2Key] as? String ?? ""
+        city = json[Building.CityKey] as? String ?? ""
+        stateProvince = json[Building.StateProvinceKey] as? String ?? ""
+        zipPostalCode = json[Building.ZipPostalCodeKey] as? String ?? ""
+        country = json[Building.CountryKey] as? String ?? ""
+
+        super.init(json: json)
+    }
+
+    public override init?(identifier: UInt, name: String) {
+        super.init(identifier: identifier, name: name)
+    }
+
+    // MARK: - Functions
+
+    public override func toJSON() -> [String: Any] {
+        var json = super.toJSON()
+
+        json[Building.StreetAddress1Key] = streetAddress1
+        json[Building.StreetAddress2Key] = streetAddress2
+        json[Building.CityKey] = city
+        json[Building.StateProvinceKey] = stateProvince
+        json[Building.ZipPostalCodeKey] = zipPostalCode
+        json[Building.CountryKey] = country
+
+        return json
+    }
 }
 
 // MARK: - Creatable