Skip to content

Commit

Permalink
Remove resourses (#13)
Browse files Browse the repository at this point in the history
* Remove resourses

* Fix links

* Fix

* Update build-example.yml

* Update build-example.yml

* Update build-example.yml

* Update build-example.yml

* Update build-example.yml

* Update build-example.yml

* Fix app

* Fix name

* Fix CI

* Update build-example.yml

* Update build-example.yml

* Update build-example.yml

* Update build-example.yml

* Update build-example.yml

* Update build-example.yml

* Update build-example.yml

* Update build-example.yml

* Fix ci

* Fix package

* Fix CI

* Fix CI

* Update build-swiftpm.yml

* Down network version

* Fix StoreKit
  • Loading branch information
aromanov91 authored Oct 3, 2023
1 parent a73b744 commit bac6393
Show file tree
Hide file tree
Showing 58 changed files with 443 additions and 204 deletions.
32 changes: 19 additions & 13 deletions .github/workflows/build-example.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
name: Build Example

on:
push:
branches: [ main, develop ]
pull_request:
branches: [ main ]
workflow_dispatch:
workflow_call:

concurrency:
group: ${{ github.head_ref || github.run_id }}
cancel-in-progress: true

env:
DEVELOPER_DIR: /Applications/Xcode_15.0.app/Contents/Developer
PROJECT_DIR: Example
PROJECT_NAME: Example.xcodeproj
iOSSCHEME: Example

jobs:

Expand All @@ -19,17 +18,24 @@ jobs:
runs-on: macOS-13
strategy:
matrix:
iosDestination: ['platform=iOS Simulator,OS=16,name=iPhone X','platform=iOS Simulator,OS=17.0,name=iPhone 14']
iosDestination: ['platform=iOS Simulator,OS=16.0,name=iPhone 14']

steps:
- name: Checkout
uses: actions/checkout@v2
with:
token: ${{ secrets.ACTIONS_TOKEN }}
repository: oversizedev/OversizeResources
uses: actions/checkout@v4

- name: Set secret
run: git config --global url."https://${{ secrets.ACTIONS_TOKEN }}:[email protected]/".insteadOf "https://github.com/"


- name: Set pipefail
run: set -euo pipefail

- name: Set SwiftPM Plugin config
run: defaults write com.apple.dt.Xcode IDESkipPackagePluginFingerprintValidatation -bool YES

- name: Build iOS
run: |
xcodebuild clean build -project "Example/Example.xcodeproj" -scheme "Example" | xcpretty && exit ${PIPESTATUS[0]}
xcodebuild clean build -project "AppExample/Example.xcodeproj" -scheme "Example" | xcpretty && exit ${PIPESTATUS[0]}
env:
destination: ${{ matrix.iosDestination }}
38 changes: 38 additions & 0 deletions .github/workflows/build-swiftpm.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Build SwiftPM

on:
workflow_dispatch:
workflow_call:

concurrency:
group: ${{ github.head_ref || github.run_id }}
cancel-in-progress: true

env:
DEVELOPER_DIR: /Applications/Xcode_15.0.app/Contents/Developer

jobs:

swiftpm:
name: Build SwiftPM
runs-on: macOS-13
strategy:
matrix:
packages: [OversizeKit, OversizeAdsKit, OversizeCalendarKit, OversizeContactsKit, OversizeLocationKit, OversizeNoticeKit, OversizeNotificationKit, OversizeOnboardingKit, OversizePhotoKit]

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Set secret
run: git config --global url."https://${{ secrets.ACTIONS_TOKEN }}:[email protected]/".insteadOf "https://github.com/"


- name: Set pipefail
run: set -euo pipefail

- name: Set SwiftPM Plugin config
run: defaults write com.apple.dt.Xcode IDESkipPackagePluginFingerprintValidatation -bool YES

- name: Build
run: xcodebuild clean build -skipPackagePluginValidation -scheme ${{ matrix.packages }} -destination 'platform=iOS Simulator,name=iPhone 8,OS=16.4' | xcpretty && exit ${PIPESTATUS[0]}
8 changes: 4 additions & 4 deletions .github/workflows/bump.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: Bump version
on:
push:
branches:
- main
workflow_dispatch:
workflow_call:

jobs:

tag:
Expand All @@ -14,7 +14,7 @@ jobs:
fetch-depth: '0'

- name: Bump version and push tag
uses: anothrNick/github-tag-action@1.61.0
uses: anothrNick/github-tag-action@master
env:
GITHUB_TOKEN: ${{ secrets.ACTIONS_TOKEN }}
WITH_V: false
18 changes: 18 additions & 0 deletions .github/workflows/ci-pull-request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: CI - Pull Request
on:
pull_request:
branches:
- 'main'
workflow_dispatch:
jobs:

build-swiftpm:
name: Build SwiftPM
uses: ./.github/workflows/build-swiftpm.yml
secrets: inherit

build-example:
name: Build Examples
needs: build-swiftpm
uses: ./.github/workflows/build-example.yml
secrets: inherit
26 changes: 26 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: CI - Push

on:
push:
branches: ["main"]
workflow_dispatch:

jobs:

build-swiftpm:
name: Build SwiftPM
uses: ./.github/workflows/build-swiftpm.yml
secrets: inherit

build-example:
name: Build Examples
needs: build-swiftpm
uses: ./.github/workflows/build-example.yml
secrets: inherit

bump:
name: Bump version
needs: build-example
uses: ./.github/workflows/bump.yml
secrets: inherit

8 changes: 3 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
.DS_Store
/.build
/Packages
xcuserdata/
DerivedData/
.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
.netrc
Package.resolved
.swiftpm
xcuserdata/
DerivedData/
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<array/>
</plist>
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
uuid = "B74BAAFC-EA46-42D9-A79A-B8453AF573E8"
type = "1"
version = "2.0">
</Bucket>
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>OversizeAdsKit.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
<key>OversizeCalendarKit.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>2</integer>
</dict>
<key>OversizeContactsKit.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>3</integer>
</dict>
<key>OversizeKit-Package.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
</dict>
<key>OversizeKit.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>4</integer>
</dict>
<key>OversizeKitTests.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>13</integer>
</dict>
<key>OversizeLocationKit.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>5</integer>
</dict>
<key>OversizeNoticeKit.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>6</integer>
</dict>
<key>OversizeNotificationKit.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>7</integer>
</dict>
<key>OversizeOnboardingKit.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>8</integer>
</dict>
<key>OversizePhotoKit.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>9</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>OversizeAdsKit</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>OversizeCalendarKit</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>OversizeContactsKit</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>OversizeKit</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>OversizeKitTests</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>OversizeLocationKit</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>OversizeNoticeKit</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>OversizeNotificationKit</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>OversizeOnboardingKit</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>OversizePhotoKit</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@
840CD67F2AC0E39D00C6AAD0 /* AppConfig.plist in Resources */ = {isa = PBXBuildFile; fileRef = 840CD67E2AC0E39D00C6AAD0 /* AppConfig.plist */; };
840CD6812AC0E39D00C6AAD0 /* Router.swift in Sources */ = {isa = PBXBuildFile; fileRef = 840CD6802AC0E39D00C6AAD0 /* Router.swift */; };
840CD6832AC0E39D00C6AAD0 /* Tabs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 840CD6822AC0E39D00C6AAD0 /* Tabs.swift */; };
840CD6862AC0E39D00C6AAD0 /* .gitignore in Resources */ = {isa = PBXBuildFile; fileRef = 840CD6852AC0E39D00C6AAD0 /* .gitignore */; };
840CD6882AC0E39D00C6AAD0 /* .swiftformat in Resources */ = {isa = PBXBuildFile; fileRef = 840CD6872AC0E39D00C6AAD0 /* .swiftformat */; };
840CD68A2AC0E39D00C6AAD0 /* .swiftlint.yml in Resources */ = {isa = PBXBuildFile; fileRef = 840CD6892AC0E39D00C6AAD0 /* .swiftlint.yml */; };
840CD68C2AC0E39D00C6AAD0 /* swiftgen.yml in Resources */ = {isa = PBXBuildFile; fileRef = 840CD68B2AC0E39D00C6AAD0 /* swiftgen.yml */; };
840CD68E2AC0E39D00C6AAD0 /* ExampleApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 840CD68D2AC0E39D00C6AAD0 /* ExampleApp.swift */; };
840CD6902AC0E3A600C6AAD0 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 840CD68F2AC0E3A600C6AAD0 /* Assets.xcassets */; };
840CD6932AC0E3A600C6AAD0 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 840CD6922AC0E3A600C6AAD0 /* Preview Assets.xcassets */; };
Expand Down Expand Up @@ -268,13 +264,9 @@
buildActionMask = 2147483647;
files = (
840CD6B12AC0E6E200C6AAD0 /* Products.storekit in Resources */,
840CD68A2AC0E39D00C6AAD0 /* .swiftlint.yml in Resources */,
840CD68C2AC0E39D00C6AAD0 /* swiftgen.yml in Resources */,
840CD6862AC0E39D00C6AAD0 /* .gitignore in Resources */,
840CD6932AC0E3A600C6AAD0 /* Preview Assets.xcassets in Resources */,
840CD67F2AC0E39D00C6AAD0 /* AppConfig.plist in Resources */,
840CD6902AC0E3A600C6AAD0 /* Assets.xcassets in Resources */,
840CD6882AC0E39D00C6AAD0 /* .swiftformat in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>Example.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>840CD6622AC0E39D00C6AAD0</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
3 changes: 2 additions & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ let productionDependencies: [PackageDescription.Package.Dependency] = { [
.package(url: "https://github.com/oversizedev/OversizeResources.git", .upToNextMajor(from: "2.0.0")),
.package(url: "https://github.com/hmlongco/Factory.git", .upToNextMajor(from: "2.1.3")),
.package(url: "https://github.com/lorenzofiamingo/swiftui-cached-async-image.git", .upToNextMajor(from: "2.1.1")),
.package(url: "https://github.com/oversizedev/OversizeNetwork.git", .upToNextMajor(from: "0.6.0"))
.package(url: "https://github.com/oversizedev/OversizeNetwork.git", .upToNextMajor(from: "0.4.0"))
] }()

let developmentDependencies: [PackageDescription.Package.Dependency] = { [
Expand Down Expand Up @@ -59,6 +59,7 @@ let package = Package(
.product(name: "OversizeLocalizable", package: "OversizeLocalizable"),
.product(name: "OversizeResources", package: "OversizeResources"),
.product(name: "OversizeNotificationService", package: "OversizeServices"),
.product(name: "OversizeNetwork", package: "OversizeNetwork"),
.product(name: "Factory", package: "Factory"),
.product(name: "CachedAsyncImage", package: "swiftui-cached-async-image"),
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// AttachmentView.swift
//

import OversizeResources
import OversizeUI
import SwiftUI

Expand All @@ -15,13 +14,13 @@ public struct AttachmentView: View {
SectionView {
VStack(spacing: .zero) {
Row("Add investment") {
IconDeprecated(.paperclip)
.iconColor(.onSurfaceHighEmphasis)
Image.Base.attach
.icon()
}

Row("Add link") {
IconDeprecated(.link)
.iconColor(.onSurfaceHighEmphasis)
Image.Base.link
.icon()
}
}
}
Expand Down
Loading

0 comments on commit bac6393

Please sign in to comment.