Skip to content

Commit

Permalink
Infra updates (#91)
Browse files Browse the repository at this point in the history
  • Loading branch information
jessesquires authored Jan 9, 2024
1 parent e066d0a commit 557fb41
Show file tree
Hide file tree
Showing 28 changed files with 88 additions and 121 deletions.
23 changes: 9 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,6 @@ on:
push:
branches:
- main
paths:
- '.github/workflows/ci.yml'
- 'Sources/**/*.*'
- 'Tests/**/*.*'
- 'Example/**/*.*'
pull_request:
branches:
- main
Expand All @@ -25,17 +20,17 @@ env:
EXAMPLE_PROJECT: Example/ExampleApp.xcodeproj
EXAMPLE_SCHEME: ExampleApp

DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_15.1.app/Contents/Developer

IOS_DEST: "platform=iOS Simulator,name=iPhone 13 Mini,OS=latest"
IOS_DEST: "platform=iOS Simulator,name=iPhone 15,OS=latest"
TVOS_DEST: "platform=tvOS Simulator,name=Apple TV,OS=latest"
WATCHOS_DEST: "platform=watchOS Simulator,name=Apple Watch Series 8 (41mm),OS=latest"
WATCHOS_DEST: "platform=watchOS Simulator,name=Apple Watch Series 9 (41mm),OS=latest"
MACOS_DEST: "platform=macOS,arch=x86_64"

jobs:
env-details:
name: Environment details
runs-on: macos-12
runs-on: macos-13
steps:
- name: xcode version
run: xcodebuild -version -sdk
Expand All @@ -47,7 +42,7 @@ jobs:
test-iOS:
name: iOS unit test
runs-on: macos-12
runs-on: macos-13
steps:
- name: git checkout
uses: actions/checkout@v4
Expand All @@ -63,7 +58,7 @@ jobs:
test-tvOS:
name: tvOS unit test
runs-on: macos-12
runs-on: macos-13
steps:
- name: git checkout
uses: actions/checkout@v4
Expand All @@ -79,7 +74,7 @@ jobs:
test-watchOS:
name: watchOS unit test
runs-on: macos-12
runs-on: macos-13
steps:
- name: git checkout
uses: actions/checkout@v4
Expand All @@ -95,7 +90,7 @@ jobs:
test-macOS:
name: macOS unit test
runs-on: macos-12
runs-on: macos-13
steps:
- name: git checkout
uses: actions/checkout@v4
Expand All @@ -111,7 +106,7 @@ jobs:
build-example:
name: build example project
runs-on: macos-12
runs-on: macos-13
steps:
- name: git checkout
uses: actions/checkout@v4
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/danger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ on:
types: [synchronize, opened, reopened, labeled, unlabeled, edited]

env:
DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_15.1.app/Contents/Developer

jobs:
main:
name: Review, Lint, Verify
runs-on: macos-12
runs-on: macos-13
steps:
- name: git checkout
uses: actions/checkout@v4
Expand All @@ -28,7 +28,6 @@ jobs:
- name: ruby setup
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2
bundler-cache: true

- name: jazzy docs
Expand Down
37 changes: 0 additions & 37 deletions .github/workflows/generate-docs.yml

This file was deleted.

8 changes: 4 additions & 4 deletions .github/workflows/pod-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ on:
- main

env:
DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_15.1.app/Contents/Developer

jobs:
main:
name: Pod Lint
runs-on: macos-12
runs-on: macos-13
steps:
- name: git checkout
uses: actions/checkout@v4
Expand All @@ -32,8 +32,8 @@ jobs:
- name: ruby setup
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2
bundler-cache: true

- name: pod lint
run: bundle exec pod lib lint --verbose
run: pod lib lint --verbose
# run: bundle exec pod lib lint --verbose
9 changes: 2 additions & 7 deletions .github/workflows/spm-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,17 @@ on:
push:
branches:
- main
paths:
- '.github/workflows/spm-macos.yml'
- 'Package*'
- 'Sources/**/*.*'
- 'Tests/**/*.*'
pull_request:
branches:
- main

env:
DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_15.1.app/Contents/Developer

jobs:
main:
name: SwiftPM Build
runs-on: macos-12
runs-on: macos-13
steps:
- name: git checkout
uses: actions/checkout@v4
Expand Down
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.2.0
5 changes: 5 additions & 0 deletions .spi.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# https://swiftpackageindex.com/SwiftPackageIndex/SPIManifest/1.1.1/documentation/spimanifest
version: 1
builder:
configs:
- documentation_targets: [Foil]
11 changes: 10 additions & 1 deletion .swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ opt_in_rules:
- return_value_from_void_function
- prefer_zero_over_explicit_init
- shorthand_optional_binding
- xct_specific_matcher
- unneeded_synthesized_initializer

# style
- attributes
Expand All @@ -66,6 +68,11 @@ opt_in_rules:
- vertical_whitespace_between_cases
- prefer_self_in_static_references
- comma_inheritance
- direct_return
- period_spacing
- superfluous_else
# - sorted_enum_cases
- non_overridable_class_declaration

# lint
- overridden_super_call
Expand All @@ -75,10 +82,12 @@ opt_in_rules:
- empty_xctest_method
- identical_operands
- prohibited_super_call
- unused_capture_list
- duplicate_enum_cases
- legacy_multiple
- accessibility_label_for_image
- lower_acl_than_parent
- unhandled_throwing_task
- private_swiftui_state

# Rules run by `swiftlint analyze` (experimental)
analyzer_rules:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1310"
LastUpgradeVersion = "1520"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
4 changes: 2 additions & 2 deletions Foil.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ Pod::Spec.new do |s|
s.summary = 'A lightweight property wrapper for UserDefaults'
s.homepage = 'https://github.com/jessesquires/Foil'
s.documentation_url = 'https://jessesquires.github.io/Foil'
s.social_media_url = 'https://twitter.com/jesse_squires'
s.social_media_url = 'https://www.jessesquires.com'
s.author = 'Jesse Squires'

s.source = { :git => 'https://github.com/jessesquires/Foil.git', :tag => s.version }
s.source_files = 'Sources/*.swift'

s.swift_version = '5.7'
s.swift_version = '5.9'

s.ios.deployment_target = '13.0'
s.tvos.deployment_target = '13.0'
Expand Down
15 changes: 10 additions & 5 deletions Foil.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,9 @@
0BF54A7725BF589E008484F8 /* Project object */ = {
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = YES;
LastSwiftUpdateCheck = 1230;
LastUpgradeCheck = 1310;
LastUpgradeCheck = 1520;
ORGANIZATIONNAME = "Hexed Bits";
TargetAttributes = {
0BF54A7F25BF589E008484F8 = {
Expand Down Expand Up @@ -307,6 +308,7 @@
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
Expand Down Expand Up @@ -377,6 +379,7 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand Down Expand Up @@ -415,6 +418,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_MODULE_VERIFIER = YES;
GENERATE_INFOPLIST_FILE = YES;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
Expand All @@ -423,6 +427,8 @@
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.0;
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
PRODUCT_BUNDLE_IDENTIFIER = com.hexedbits.Foil;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -445,6 +451,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_MODULE_VERIFIER = YES;
GENERATE_INFOPLIST_FILE = YES;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
Expand All @@ -453,6 +460,8 @@
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.0;
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
PRODUCT_BUNDLE_IDENTIFIER = com.hexedbits.Foil;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -471,13 +480,11 @@
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = "";
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 11.0;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "";
Expand All @@ -493,13 +500,11 @@
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = "";
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 11.0;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "";
Expand Down
2 changes: 1 addition & 1 deletion Foil.xcodeproj/xcshareddata/xcschemes/Foil.xcscheme
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1310"
LastUpgradeVersion = "1520"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Loading

0 comments on commit 557fb41

Please sign in to comment.