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

Fix product ref in pbx target dependency #91

Merged
merged 2 commits into from
Oct 11, 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
10 changes: 5 additions & 5 deletions .github/workflows/commit-grammar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Commit Grammar

on:
push:
branches: [ main ]
branches: [main]

jobs:
commit_grammar:
Expand All @@ -12,16 +12,16 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v2
with:
distribution: 'zulu'
distribution: "zulu"
java-version: 11
- name: Download ANTLR 4.11.1
- name: Download ANTLR 4.13.1
working-directory: /tmp
run: |
wget https://www.antlr.org/download/antlr-4.11.1-complete.jar
wget https://www.antlr.org/download/antlr-4.13.1-complete.jar
- name: Update grammar
working-directory: kin/grammar
run: |
java -jar /tmp/antlr-4.11.1-complete.jar PBXProj.g4 -Dlanguage=Python3
java -jar /tmp/antlr-4.13.1-complete.jar PBXProj.g4 -Dlanguage=Python3
- name: Commit changes
run: |
git add kin/grammar
Expand Down
49 changes: 24 additions & 25 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@ name: Python Package

on:
push:
branches: [ main ]
branches: [main]
pull_request:
branches: [ main ]
branches: [main]

jobs:
update_grammar:

runs-on: ubuntu-latest

steps:
Expand All @@ -20,14 +19,14 @@ jobs:
uses: actions/setup-java@v1
with:
java-version: 11
- name: Download ANTLR 4.11.1
- name: Download ANTLR 4.13.1
working-directory: /tmp
run: |
wget https://www.antlr.org/download/antlr-4.11.1-complete.jar
wget https://www.antlr.org/download/antlr-4.13.1-complete.jar
- name: Generate grammar
working-directory: kin/grammar
run: |
java -jar /tmp/antlr-4.11.1-complete.jar PBXProj.g4 -Dlanguage=Python3
java -jar /tmp/antlr-4.13.1-complete.jar PBXProj.g4 -Dlanguage=Python3
- name: Upload grammar
uses: actions/upload-artifact@master
with:
Expand All @@ -40,24 +39,24 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.x']
python-version: ["3.x"]

steps:
- uses: actions/checkout@v3
- name: Download grammar
uses: actions/download-artifact@master
with:
name: grammar
path: kin/grammar
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install pytest
pip install .
- name: Test
run: |
./tests/tester.py
- uses: actions/checkout@v3
- name: Download grammar
uses: actions/download-artifact@master
with:
name: grammar
path: kin/grammar
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install pytest
pip install .
- name: Test
run: |
./tests/tester.py
1 change: 1 addition & 0 deletions kin/grammar/PBXProj.g4
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,7 @@ pbx_target_dependency
name?
platform_filter?
platform_filters?
product_ref?
target?
target_proxy
'}' ';'
Expand Down
2 changes: 1 addition & 1 deletion kin/grammar/PBXProj.interp

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions kin/grammar/PBXProjLexer.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated from PBXProj.g4 by ANTLR 4.11.1
# Generated from PBXProj.g4 by ANTLR 4.13.1
from antlr4 import *
from io import StringIO
import sys
Expand Down Expand Up @@ -1212,7 +1212,7 @@ class PBXProjLexer(Lexer):

def __init__(self, input=None, output:TextIO = sys.stdout):
super().__init__(input, output)
self.checkVersion("4.11.1")
self.checkVersion("4.13.1")
self._interp = LexerATNSimulator(self, self.atn, self.decisionsToDFA, PredictionContextCache())
self._actions = None
self._predicates = None
Expand Down
4 changes: 2 additions & 2 deletions kin/grammar/PBXProjListener.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated from PBXProj.g4 by ANTLR 4.11.1
# Generated from PBXProj.g4 by ANTLR 4.13.1
from antlr4 import *
if __name__ is not None and "." in __name__:
if "." in __name__:
from .PBXProjParser import PBXProjParser
else:
from PBXProjParser import PBXProjParser
Expand Down
2,409 changes: 1,211 additions & 1,198 deletions kin/grammar/PBXProjParser.py

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
packages=find_packages(exclude=['tests']),
install_requires=[
'argparse==1.4.0',
'antlr4-python3-runtime==4.11.1'
'antlr4-python3-runtime==4.13.1'
],
entry_points={
'console_scripts': [
Expand Down
711 changes: 711 additions & 0 deletions tests/ok/013.pbxproj

Large diffs are not rendered by default.

Loading