Skip to content

Commit 2d1c67c

Browse files
Merge branch 'master' into swiftUI
2 parents 9b3b0a2 + 5025163 commit 2d1c67c

File tree

7 files changed

+58
-366
lines changed

7 files changed

+58
-366
lines changed

.github/workflows/checks.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: Build
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
pull_request:
7+
branches: '*'
8+
9+
env:
10+
DEVELOPER_DIR: /Applications/Xcode_11.4.app/Contents/Developer
11+
12+
jobs:
13+
iOS:
14+
runs-on: macos-latest
15+
steps:
16+
- name: Checkout
17+
uses: actions/checkout@v2
18+
- name: Build
19+
run: xcodebuild -scheme "Rswift-iOS"
20+
tvOS:
21+
runs-on: macos-latest
22+
steps:
23+
- name: Checkout
24+
uses: actions/checkout@v2
25+
- name: Build
26+
run: xcodebuild -scheme "Rswift-tvOS"
27+
watchOS:
28+
runs-on: macos-latest
29+
steps:
30+
- name: Checkout
31+
uses: actions/checkout@v2
32+
- name: Build
33+
run: xcodebuild -scheme "Rswift-watchOS"

.github/workflows/release.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Release
2+
3+
on:
4+
release:
5+
types: created
6+
7+
env:
8+
DEVELOPER_DIR: /Applications/Xcode_11.4.app/Contents/Developer
9+
10+
jobs:
11+
publish:
12+
runs-on: macos-latest
13+
steps:
14+
- name: Checkout
15+
uses: actions/checkout@v2
16+
- name: Publish to Cocoapods
17+
run: |
18+
export POD_VERSION=$(echo $TAG_NAME | cut -c2-)
19+
pod trunk push
20+
env:
21+
TAG_NAME: ${{ github.event.release.tag_name }}
22+
COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}

Package.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ let package = Package(
77
platforms: [
88
.iOS(.v11),
99
.tvOS(.v9),
10-
.watchOS(.v2),
11-
10+
.watchOS(.v2)
1211
],
1312
products: [
1413
.library(name: "Rswift", targets: ["Rswift"]),

R.swift.Library.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |spec|
22

33
spec.name = "R.swift.Library"
4-
spec.version = "5.2.0"
4+
spec.version = ENV['POD_VERSION']
55
spec.license = "MIT"
66

77
spec.summary = "Companion library for R.swift, featuring types used to type resources"
@@ -21,7 +21,7 @@ Pod::Spec.new do |spec|
2121

2222
spec.pod_target_xcconfig = { 'APPLICATION_EXTENSION_API_ONLY' => 'YES' }
2323

24-
spec.ios.deployment_target = '8.0'
24+
spec.ios.deployment_target = '9.0'
2525
spec.ios.source_files = "Library/**/*.swift"
2626
spec.tvos.deployment_target = '9.0'
2727
spec.tvos.source_files = "Library/**/*.swift"

fastlane/Fastfile

Lines changed: 0 additions & 98 deletions
This file was deleted.

fastlane/actions/af_create_github_release.rb

Lines changed: 0 additions & 157 deletions
This file was deleted.

0 commit comments

Comments
 (0)