Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
# Conflicts:
#	README.md
#	fastlane/Fastfile
  • Loading branch information
SvenTiigi committed Jan 6, 2022
2 parents 2750b86 + 795102d commit ad14c61
Show file tree
Hide file tree
Showing 172 changed files with 3,933 additions and 7,912 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
- Xcode version:
- Swift version:
- macOS version running Xcode:
- Dependency manager (SPM, Carthage, CocoaPods, Manually):
- Dependency manager (SPM, Manually):

## What did you do?

Expand Down
30 changes: 16 additions & 14 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
name: CI

on: [push]
on:
push:
branches:
- master
- develop
pull_request:
branches:
- master
- develop

jobs:
tests:
name: Unit-Tests
runs-on: macOS-latest
build:
runs-on: macos-latest
steps:
- uses: actions/checkout@v1
- name: fastlane ios tests
run: fastlane ios tests
compatibility:
name: Compatibility-Tests
runs-on: macOS-latest
steps:
- uses: actions/checkout@v1
- name: fastlane ios compatibilityTests
run: fastlane ios compatibilityTests
- uses: actions/checkout@v2
- name: Build
run: swift build -v
- name: Run tests
run: swift test -v
109 changes: 6 additions & 103 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,104 +1,7 @@

# Created by https://www.gitignore.io/api/macos,xcode,carthage,cocoapods,fastlane

### Carthage ###
# Carthage
#
# Add this line if you want to avoid checking in source code from Carthage dependencies.
Carthage/Checkouts

Carthage/Build

### CocoaPods ###
## CocoaPods GitIgnore Template

# CocoaPods - Only use to conserve bandwidth / Save time on Pushing
# - Also handy if you have a large number of dependant pods
# - AS PER https://guides.cocoapods.org/using/using-cocoapods.html NEVER IGNORE THE LOCK FILE
Pods/

### macOS ###
*.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon

# Thumbnails
._*

# Documentation
Documentation

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

### Xcode ###
# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

## Build generated
build/
DerivedData/

## Various settings
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
.DS_Store
/.build
/Packages
/*.xcodeproj
xcuserdata/

## Other
*.moved-aside
*.xccheckout
*.xcscmblueprint

### Xcode Patch ###
*.xcodeproj/*
!*.xcodeproj/project.pbxproj
!*.xcodeproj/xcshareddata/
!*.xcworkspace/contents.xcworkspacedata
/*.gcno

### fastlane ###
# fastlane - A streamlined workflow tool for Cocoa deployment
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://docs.fastlane.tools/best-practices/source-control/#source-control

# fastlane specific
/fastlane/README.md
fastlane/report.xml

# deliver temporary files
fastlane/Preview.html

# snapshot generated screenshots
fastlane/screenshots/**/*.png
fastlane/screenshots/screenshots.html

# scan temporary files
fastlane/test_output

# End of https://www.gitignore.io/api/macos,xcode,carthage,cocoapods,fastlane
DerivedData/
.swiftpm/
8 changes: 0 additions & 8 deletions .jazzy.yaml

This file was deleted.

26 changes: 0 additions & 26 deletions .swiftlint.yml

This file was deleted.

28 changes: 0 additions & 28 deletions Configs/WhatsNewKit.plist

This file was deleted.

24 changes: 0 additions & 24 deletions Configs/WhatsNewKitTests.plist

This file was deleted.

53 changes: 0 additions & 53 deletions Example/AppDelegate.swift

This file was deleted.

58 changes: 0 additions & 58 deletions Example/Configurations/AnimationConfiguration.swift

This file was deleted.

Loading

0 comments on commit ad14c61

Please sign in to comment.