Skip to content
This repository has been archived by the owner on Jan 5, 2024. It is now read-only.

Bring internal version of component to public repository #64

Merged
merged 1 commit into from
Oct 19, 2023
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
20 changes: 0 additions & 20 deletions .github/workflows/publish-to-trunk-workflow.yml

This file was deleted.

29 changes: 6 additions & 23 deletions .github/workflows/pull-request-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ jobs:
runs-on: macOS-latest
timeout-minutes: 15
steps:
- name: Cancel previous jobs
uses: styfle/[email protected]
with:
access_token: ${{ github.token }}
- name: Git checkout
uses: actions/[email protected]
with:
Expand All @@ -18,22 +14,9 @@ jobs:
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: latest-stable
- name: Setup ruby and bundler dependencies
uses: ruby/[email protected]
with:
bundler-cache: true
- name: Build for testing
run: |
xcodebuild build-for-testing \
-scheme Shock \
-destination "platform=iOS Simulator,OS=15.2,name=iPhone 13"
- name: Test without building
run: |
xcodebuild test-without-building \
-scheme Shock \
-destination "platform=iOS Simulator,OS=15.2,name=iPhone 13"
- name: Validate pod
run: |
set -eo pipefail
export LIB_VERSION=$(git describe --tags `git rev-list --tags --max-count=1`)
bundle exec pod lib lint --allow-warnings
- name: Delete build artifacts
shell: bash
run: swift package clean
- name: Run tests
shell: bash
run: swift test
106 changes: 83 additions & 23 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,18 @@
# OS X
.DS_Store

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

## User settings
xcuserdata/

## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
*.xcscmblueprint
*.xccheckout

## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
build/
DerivedData/
*.moved-aside
*.pbxuser
!default.pbxuser
*.mode1v3
Expand All @@ -11,32 +21,82 @@ build/
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata/
*.xccheckout
profile
*.moved-aside
DerivedData

## Obj-C/Swift specific
*.hmap

## App packaging
*.ipa
.build
*.dSYM.zip
*.dSYM

# Bundler
.bundle
## Playgrounds
timeline.xctimeline
playground.xcworkspace

# Add this line if you want to avoid checking in source code from Carthage dependencies.
# Carthage/Checkouts
# Swift Package Manager
#
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
# Packages/
# Package.pins
# Package.resolved
# *.xcodeproj
#
# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata
# hence it is not needed unless you have added a package configuration file to your project
# .swiftpm

Carthage/Build
.build/

# CocoaPods
#
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
#
# Note: if you ignore the Pods directory, make sure to uncomment
# `pod install` in .travis.yml
#
Pods/
default.profraw
fastlane/test_output/
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
#
# Pods/
#
# Add this line if you want to avoid checking in source code from the Xcode workspace
# *.xcworkspace

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

Carthage/Build/

# Accio dependency management
Dependencies/
.accio/

# fastlane
#
# 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/report.xml
derived_data/
fastlane/Preview.html
fastlane/screenshots/**/*.png
fastlane/test_output

# Code Injection
#
# After new code Injection tools there's a generated folder /iOSInjectionProject
# https://github.com/johnno1962/injectionforxcode

iOSInjectionProject/

# macOS
.DS_Store

# Git
*.orig

# Object files
.build/

# Brew
Brewfile.lock.json
1 change: 0 additions & 1 deletion .ruby-version

This file was deleted.

44 changes: 22 additions & 22 deletions .swiftpm/xcode/xcshareddata/xcschemes/Shock.xcscheme
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1340"
LastUpgradeVersion = "1430"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -14,37 +14,37 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "Shock_UnitTests"
BuildableName = "Shock_UnitTests"
BlueprintName = "Shock_UnitTests"
BlueprintIdentifier = "Shock"
BuildableName = "Shock"
BlueprintName = "Shock"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
buildForRunning = "NO"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "Shock"
BuildableName = "Shock"
BlueprintName = "Shock"
BlueprintIdentifier = "ShockTests"
BuildableName = "ShockTests"
BlueprintName = "ShockTests"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "UnitTests"
BuildableName = "UnitTests"
BlueprintName = "UnitTests"
BlueprintIdentifier = "Shock_ShockTests"
BuildableName = "Shock_ShockTests"
BlueprintName = "Shock_ShockTests"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
Expand All @@ -60,9 +60,9 @@
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "UnitTests"
BuildableName = "UnitTests"
BlueprintName = "UnitTests"
BlueprintIdentifier = "ShockTests"
BuildableName = "ShockTests"
BlueprintName = "ShockTests"
ReferencedContainer = "container:">
</BuildableReference>
</TestableReference>
Expand All @@ -88,9 +88,9 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "Shock_UnitTests"
BuildableName = "Shock_UnitTests"
BlueprintName = "Shock_UnitTests"
BlueprintIdentifier = "Shock_ShockTests"
BuildableName = "Shock_ShockTests"
BlueprintName = "Shock_ShockTests"
ReferencedContainer = "container:">
</BuildableReference>
</MacroExpansion>
Expand Down
21 changes: 21 additions & 0 deletions Demo/BuildConfigurations/DemoApp.xcconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
ASSETCATALOG_COMPILER_APPICON_NAME=AppIcon
CODE_SIGN_IDENTITY=Apple Development
CODE_SIGN_STYLE=Automatic
DEVELOPMENT_TEAM=
ENABLE_NS_ASSERTIONS=NO
ENABLE_PREVIEWS=YES
ENABLE_TESTABILITY=YES
FRAMEWORK_SEARCH_PATHS=$(inherited)
GCC_OPTIMIZATION_LEVEL[config=Debug]=0
GCC_OPTIMIZATION_LEVEL[config=Release]=fast
GCC_PREPROCESSOR_DEFINITIONS[config=Debug]=DEBUG=1 $(inherited)
LD_RUNPATH_SEARCH_PATHS=$(inherited) @executable_path/Frameworks
MTL_ENABLE_DEBUG_INFO[config=Debug]=YES
MTL_ENABLE_DEBUG_INFO[config=Release]=NO
PRODUCT_BUNDLE_IDENTIFIER=com.justeattakeaway.shock.demoapp
PRODUCT_MODULE_NAME=$(TARGET_NAME:c99extidentifier)
PRODUCT_NAME=$(TARGET_NAME)
PROVISIONING_PROFILE_SPECIFIER[config=Debug]=
PROVISIONING_PROFILE_SPECIFIER[config=Release]=
SWIFT_OPTIMIZATION_LEVEL=-Onone
TARGETED_DEVICE_FAMILY=1,2
55 changes: 55 additions & 0 deletions Demo/BuildConfigurations/Project.xcconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
ALWAYS_SEARCH_USER_PATHS=NO
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED=YES
CLANG_CXX_LANGUAGE_STANDARD=gnu++0x
CLANG_CXX_LIBRARY=libc++
CLANG_ENABLE_MODULES=YES
CLANG_ENABLE_OBJC_ARC=YES
CLANG_WARN__DUPLICATE_METHOD_MATCH=YES
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING=YES
CLANG_WARN_BOOL_CONVERSION=YES
CLANG_WARN_COMMA=YES
CLANG_WARN_CONSTANT_CONVERSION=YES
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS=YES
CLANG_WARN_DIRECT_OBJC_ISA_USAGE=YES_ERROR
CLANG_WARN_EMPTY_BODY=YES
CLANG_WARN_ENUM_CONVERSION=YES
CLANG_WARN_INFINITE_RECURSION=YES
CLANG_WARN_INT_CONVERSION=YES
CLANG_WARN_NON_LITERAL_NULL_CONVERSION=YES
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF=YES
CLANG_WARN_OBJC_LITERAL_CONVERSION=YES
CLANG_WARN_OBJC_ROOT_CLASS=YES_ERROR
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER=YES
CLANG_WARN_RANGE_LOOP_ANALYSIS=YES
CLANG_WARN_STRICT_PROTOTYPES=YES
CLANG_WARN_SUSPICIOUS_MOVE=YES
CLANG_WARN_UNREACHABLE_CODE=YES
COPY_PHASE_STRIP=NO
CURRENT_PROJECT_VERSION=1
DEBUG_INFORMATION_FORMAT[config=Debug]=dwarf
DEBUG_INFORMATION_FORMAT[config=Release]=dwarf-with-dsym
ENABLE_NS_ASSERTIONS[config=Debug]=YES
ENABLE_NS_ASSERTIONS[config=Release]=NO
ENABLE_STRICT_OBJC_MSGSEND=YES
GCC_C_LANGUAGE_STANDARD=gnu99
GCC_DYNAMIC_NO_PIC=NO
GCC_NO_COMMON_BLOCKS=YES
GCC_OPTIMIZATION_LEVEL=fast
GCC_SYMBOLS_PRIVATE_EXTERN=NO
GCC_TREAT_WARNINGS_AS_ERRORS=YES
GCC_WARN_64_TO_32_BIT_CONVERSION=YES
GCC_WARN_ABOUT_RETURN_TYPE=YES_ERROR
GCC_WARN_UNDECLARED_SELECTOR=YES
GCC_WARN_UNINITIALIZED_AUTOS=YES_AGGRESSIVE
GCC_WARN_UNUSED_FUNCTION=YES
GCC_WARN_UNUSED_VARIABLE=YES
IPHONEOS_DEPLOYMENT_TARGET=15.2
MARKETING_VERSION=1.0
ONLY_ACTIVE_ARCH=YES
OTHER_LDFLAGS=$(OTHER_LDFLAGS) -ObjC
SDKROOT=iphoneos
SWIFT_OPTIMIZATION_LEVEL=-O
SWIFT_TREAT_WARNINGS_AS_ERRORS=YES
SWIFT_VERSION=5.0
VALIDATE_PRODUCT=YES
VERSIONING_SYSTEM=apple-generic
9 changes: 9 additions & 0 deletions Demo/BuildConfigurations/UITests.xcconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
CLANG_ANALYZER_NONNULL=YES
CLANG_WARN_DOCUMENTATION_COMMENTS=YES
INFOPLIST_FILE=UITests/Info.plist
LD_RUNPATH_SEARCH_PATHS=$(inherited) @executable_path/Frameworks @loader_path/Frameworks
PRODUCT_BUNDLE_IDENTIFIER=com.justeattakeaway.shock.uitests
PRODUCT_NAME=$(TARGET_NAME)
SWIFT_ACTIVE_COMPILATION_CONDITIONS[config=Debug]=DEBUG
SWIFT_OPTIMIZATION_LEVEL=-O
TEST_TARGET_NAME=DemoApp
Loading
Loading