Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate from Carthage to SwiftPM + Upgrade to Xcode 12 #9

Merged
merged 4 commits into from
May 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 18 additions & 11 deletions .bartycrouch.toml
Original file line number Diff line number Diff line change
@@ -1,22 +1,29 @@
[update]
tasks = ["interfaces", "transform", "translate", "normalize"]
tasks = ["interfaces", "normalize", "translate", "transform"]

[update.interfaces]
path = "App/Sources"

[update.transform]
codePath = "App/Sources"
localizablePath = "App/Resources"
transformer = "swiftgenStructured"
supportedLanguageEnumPath = "App/SupportingFiles"
paths = ["App/Sources"]

[update.normalize]
path = "App"
paths = ["App/Resources"]
sourceLocale = "en"
harmonizeWithSource = true
sortByKeys = true

[update.translate]
path = "App"
paths = ["App/Resources"]
secret = ""
sourceLocale = "en"

[update.transform]
codePaths = ["App/Sources"]
localizablePaths = ["App/Resources"]
transformer = "swiftgenStructured"
supportedLanguageEnumPath = "App/Resources"
typeName = "BartyCrouch"
translateMethodName = "translate"

[lint]
path = "App"
paths = ["App/Resources"]
duplicateKeys = true
emptyValues = true
2 changes: 0 additions & 2 deletions .envrc

This file was deleted.

15 changes: 15 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: Main

on:
push:
branches: [main]

jobs:
tests:
runs-on: macOS-latest

steps:
- uses: actions/checkout@v2

- name: Build & Run Tests
run: xcodebuild test -scheme App -destination 'platform=iOS Simulator,name=iPad Air (4th generation),OS=latest'
24 changes: 24 additions & 0 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Pull Request

on:
pull_request:
branches: [main]

jobs:
cancel-previous-runs:
runs-on: ubuntu-latest

steps:
- name: Cancel previous runs of this workflow on same branch
uses: rokroskar/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

tests:
runs-on: macOS-latest

steps:
- uses: actions/checkout@v2

- name: Build & Run Tests
run: xcodebuild test -scheme App -destination 'platform=iOS Simulator,name=iPad Air (4th generation),OS=latest'
32 changes: 29 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,32 @@
## macOS
# General
.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon


# Thumbnails
._*

# 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
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
Expand Down Expand Up @@ -64,6 +93,3 @@ fastlane/Preview.html
fastlane/screenshots
fastlane/test_output
fastlane/metadata/review_information

# Symbolic Links to Scripts
Scripts/SymLinks
15 changes: 15 additions & 0 deletions .swift-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"lineBreakAroundMultilineExpressionChainComponents": true,
"lineBreakBeforeControlFlowKeywords": true,
"lineBreakBeforeEachArgument": true,
"lineBreakBeforeEachGenericRequirement": true,
"lineLength": 120,
"prioritizeKeepingFunctionOutputTogether": true,
"rules": {
"NeverUseImplicitlyUnwrappedOptionals": false,
"NoLeadingUnderscores": true,
"ValidateDocumentationComments": false,
},
"tabWidth": 2,
"version": 1,
}
Loading