Merge pull request #58 from railwaymen/restler-1.0-branch

Release v1.0

.github/workflows/examle.yml → .github/workflows/example.yml

@@ -4,12 +4,12 @@ on:
   push:
     branches:
       - master
-      - develop
+      - 'restler-*-branch'
       - 'release/*'
   pull_request:
     branches:
       - master
-      - develop
+      - 'restler-*-branch'
       - 'release/*'
 
 jobs:
@@ -30,21 +30,23 @@ jobs:
           brew install gettext
           brew link --force gettext
 
+      - name: Install mint
+        run: brew install mint
+
       - name: Set up config files
         run: envsubst < Restler-Example/Configuration/env_debug.xcconfig.tpl > Restler-Example/Configuration/Debug.xcconfig
         working-directory: ${{ env.working-directory }}
         shell: bash
 
-      - name: Install dependencies
-        run: pod install || pod install --repo-update
-        working-directory: ${{ env.working-directory }}
+      - name: Install mint dependencies
+        run: mint bootstrap
 
       - name: Clean
         run: xcodebuild clean | xcpretty
         working-directory: ${{ env.working-directory }}
         shell: bash
 
       - name: Build
-        run: xcodebuild build -scheme Restler-Example -workspace Restler-Example.xcworkspace | xcpretty --color
+        run: xcodebuild build -scheme Restler-Example -project Restler-Example.xcodeproj | xcpretty --color
         working-directory: ${{ env.working-directory }}
         shell: bash

.github/workflows/package.yml

@@ -4,12 +4,12 @@ on:
   push:
     branches:
       - master
-      - develop
+      - 'restler-*-branch'
       - 'release/*'
   pull_request:
     branches:
       - master
-      - develop
+      - 'restler-*-branch'
       - 'release/*'
 
 jobs:
@@ -29,7 +29,7 @@ jobs:
       - name: Checkout branch
         uses: actions/checkout@v2
       - name: Lint podspec
-        run: pod lib lint
+        run: pod lib lint --allow-warnings
 
   test:
     runs-on: macos-latest

.gitignore

@@ -1,10 +1,15 @@
 .DS_Store
-/.build
-/Packages
+.build
+.bundle
+Packages
 /*.xcodeproj
 /*.xcworkspace
-/xcuserdata
-/output
+xcuserdata
+output
 *.xcconfig
-/muter_logs
+muter_logs
 *.lcov
+*.orig
+Pods
+vendor
+fastlane/report.xml

.swiftlint.yml

@@ -2,9 +2,10 @@ disabled_rules:
   - trailing_whitespace
   - xctfail_message
   - trailing_comma
+  - closure_parameter_position
 
 line_length:
-  warning: 160
+  warning: 128
   error: 160
 
 function_body_length:
@@ -13,6 +14,7 @@ function_body_length:
 identifier_name:
   excluded:
     - id
+    - rx
 
 warning_threshold: 5
 

Mintfile

@@ -0,0 +1 @@
+realm/SwiftLint@0.40.0

Package.resolved

@@ -0,0 +1,16 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "RxSwift",
+        "repositoryURL": "https://github.com/ReactiveX/RxSwift.git",
+        "state": {
+          "branch": null,
+          "revision": "002d325b0bdee94e7882e1114af5ff4fe1e96afa",
+          "version": "5.1.1"
+        }
+      }
+    ]
+  },
+  "version": 1
+}

Package.swift

@@ -1,24 +1,29 @@
-// swift-tools-version:5.1
-// The swift-tools-version declares the minimum version of Swift required to build this package.
-
+// swift-tools-version:5.0
 import PackageDescription
 
 let package = Package(
     name: "Restler",
-    platforms: [
-        .iOS(.v11),
-        .macOS(.v10_15)
-    ],
     products: [
         .library(
             name: "Restler",
             targets: ["Restler"]),
+        .library(
+            name: "RxRestler",
+            targets: ["RxRestler"]),
+    ],
+    dependencies: [
+        .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "5.1.1")),
     ],
-    dependencies: [],
     targets: [
         .target(
             name: "Restler",
             dependencies: []),
+        .target(
+            name: "RxRestler",
+            dependencies: [
+                "Restler",
+                .product(name: "RxSwift", package: "RxSwift"),
+            ]),
         .testTarget(
             name: "RestlerTests",
             dependencies: ["Restler"])