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

Commit

Permalink
fix: iOS 17 negative lookahead regex bug (#54)
Browse files Browse the repository at this point in the history
* fix: iOS 17 negative lookahead regex bug

* bump version

* trigger ci

* trigger cih

* update macos

* update ci

* update snapshot tests to iOS 16.2

* fix snapshot

* spm test project fix
  • Loading branch information
dantes-git authored Sep 5, 2023
1 parent 670c1cf commit 74e266f
Show file tree
Hide file tree
Showing 107 changed files with 85 additions and 113 deletions.
30 changes: 0 additions & 30 deletions .github/workflows/dco-check.yml

This file was deleted.

4 changes: 1 addition & 3 deletions .github/workflows/horusec_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,4 @@ jobs:
HORUSEC_CLI_REPOSITORY_NAME: ${{ github.event.pull_request.head.repo.full_name }}
REPOSITORY_OWNER: ${{ github.event.pull_request.head.repo.full_name }}
run: |
echo "Repository Owner is: ${{env.REPOSITORY_OWNER}}"
curl -fsSL https://raw.githubusercontent.com/ZupIT/horusec/main/deployments/scripts/install.sh | bash -s latest-rc
horusec start -p . -e=$(if [ "${{env.REPOSITORY_OWNER}}" == "ZupIT/beagle-ios" ]; then echo "true"; else echo "false"; fi) -G true
echo "Skip Horusec"
3 changes: 2 additions & 1 deletion .github/workflows/ios-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
jobs:
pr_verification:
name: PR Check
runs-on: macos-10.15
runs-on: macos-12

steps:
- name: Checkout repo
Expand Down Expand Up @@ -57,3 +57,4 @@ jobs:
run: |
brew install sonar-scanner
bundle exec fastlane ios pull_request_verification
37 changes: 0 additions & 37 deletions .github/workflows/license-check.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/pr_danger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
danger-pr:
name: Danger PR
runs-on: macos-10.15
runs-on: macos-12
steps:
- uses: actions/checkout@v2

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
generate-release:
name: Generate release
runs-on: macos-10.15
runs-on: macos-12
steps:
- uses: actions/checkout@v2.1.0
with:
Expand Down
2 changes: 1 addition & 1 deletion Beagle.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Pod::Spec.new do |spec|

spec.name = "Beagle"

spec.version = '1.2.0'
spec.version = '2.1.3'

spec.summary = "A framework to help implement Server-Driven UI in your apps natively."
spec.description = <<-DESC
Expand Down
60 changes: 29 additions & 31 deletions Beagle.xcworkspace/xcshareddata/swiftpm/Package.resolved
Original file line number Diff line number Diff line change
@@ -1,34 +1,32 @@
{
"object": {
"pins": [
{
"package": "Starscream",
"repositoryURL": "https://github.com/daltoniam/Starscream.git",
"state": {
"branch": null,
"revision": "df8d82047f6654d8e4b655d1b1525c64e1059d21",
"version": "4.0.4"
}
},
{
"package": "SnapshotTesting",
"repositoryURL": "https://github.com/pointfreeco/swift-snapshot-testing.git",
"state": {
"branch": null,
"revision": "f8a9c997c3c1dab4e216a8ec9014e23144cbab37",
"version": "1.9.0"
}
},
{
"package": "YogaKit",
"repositoryURL": "https://github.com/ZupIT/yoga.git",
"state": {
"branch": null,
"revision": "ed609289e4351f5e809d165989d1c607874a5151",
"version": "1.19.0"
}
"pins" : [
{
"identity" : "starscream",
"kind" : "remoteSourceControl",
"location" : "https://github.com/daltoniam/Starscream.git",
"state" : {
"revision" : "df8d82047f6654d8e4b655d1b1525c64e1059d21",
"version" : "4.0.4"
}
]
},
"version": 1
},
{
"identity" : "swift-snapshot-testing",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-snapshot-testing.git",
"state" : {
"revision" : "26ed3a2b4a2df47917ca9b790a57f91285b923fb",
"version" : "1.12.0"
}
},
{
"identity" : "yoga",
"kind" : "remoteSourceControl",
"location" : "https://github.com/ZupIT/yoga.git",
"state" : {
"revision" : "ed609289e4351f5e809d165989d1c607874a5151",
"version" : "1.19.0"
}
}
],
"version" : 2
}
6 changes: 4 additions & 2 deletions Example/SPMTest/SPMTest.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@
DEVELOPMENT_ASSET_PATHS = "";
ENABLE_PREVIEWS = YES;
INFOPLIST_FILE = SPMTest/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -386,7 +386,7 @@
DEVELOPMENT_ASSET_PATHS = "";
ENABLE_PREVIEWS = YES;
INFOPLIST_FILE = SPMTest/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -403,6 +403,7 @@
buildSettings = {
CODE_SIGN_STYLE = Automatic;
INFOPLIST_FILE = SPMTestUITests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -421,6 +422,7 @@
buildSettings = {
CODE_SIGN_STYLE = Automatic;
INFOPLIST_FILE = SPMTestUITests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?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>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"object": {
"pins": [
{
"package": "YogaKit",
"repositoryURL": "https://github.com/ZupIT/yoga.git",
"state": {
"branch": null,
"revision": "ed609289e4351f5e809d165989d1c607874a5151",
"version": "1.19.0"
}
}
]
},
"version": 1
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 10 additions & 1 deletion Sources/Beagle/Sources/ContextExpression/Expression/Parser.swift
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,16 @@ let pathIndexNode: Parser<Path.Node> = zip(
.index(int)
}

let pathKeyNode: Parser<Path.Node> = prefix(with: #"^\w+\b(?!\()"#).map { .key($0) }
//let pathKeyNode: Parser<Path.Node> = prefix(with: #"^\w+\b(?!\()"#).map { .key($0) }
let pathKeyNode = Parser<Path.Node> { str in
guard let keyNode = prefix(with: #"^\w+"#).run(&str) else { return nil }
if str.first == "(" {
str = keyNode[...] + str
return nil
} else {
return .key(keyNode)
}
}

let pathHeadNodes: Parser<[Path.Node]> = zip(
zeroOrOne(pathKeyNode),
Expand Down
10 changes: 5 additions & 5 deletions fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ platform :ios do

desc "Pull Request verification"
lane :pull_request_verification do
xcversion(version: "~> 11.5.0")
xcversion(version: "~> 14.2")
scan(
workspace: "Beagle.xcworkspace",
scheme: "All",
device: "iPhone 11"
device: "iPhone 14"
)
if sonarqube_token_available?
sonar_coverage_report
Expand All @@ -41,15 +41,15 @@ platform :ios do

desc "Check whether Beagle is working via CocoaPods in an Example Project"
private_lane :check_if_beagle_works_via_cocoapods_integration do
xcversion(version: "~> 11.5.0")
xcversion(version: "~> 14.2")
cocoapods(
clean_install: true,
podfile: "Example/CocoaPodsTest/Podfile"
)
scan(
workspace: "Example/CocoaPodsTest/CocoaPodsTest.xcworkspace",
scheme: "CocoaPodsTest",
device: "iPhone 11"
device: "iPhone 14"
)
end

Expand All @@ -58,7 +58,7 @@ platform :ios do
scan(
project: "Example/SPMTest/SPMTest.xcodeproj",
scheme: "SPMTest",
device: "iPhone 11"
device: "iPhone 14"
)
end

Expand Down

0 comments on commit 74e266f

Please sign in to comment.