Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
m1ga authored May 14, 2024
2 parents e1949a4 + c89ece1 commit 52abb7b
Show file tree
Hide file tree
Showing 8 changed files with 10,672 additions and 14,733 deletions.
2 changes: 2 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
github: tidev
liberapay: tidev
5 changes: 5 additions & 0 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ jobs:
with:
node-version: '18.x'

- uses: actions/setup-java@v3
with:
distribution: 'adopt'
java-version: '11'

- name: Cache Node.js modules
id: node-cache
uses: actions/cache@v4
Expand Down
13 changes: 13 additions & 0 deletions .github/workflows/cla.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Check CLA
on:
- pull_request

jobs:
check-cla:
runs-on: ubuntu-latest
name: Verify contributor

steps:
- uses: tidev/tidev-cla-action@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
39 changes: 39 additions & 0 deletions .github/workflows/regen-docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Regen Docs
on:
workflow_dispatch:
pull_request:
types: [ closed ]
branches: [ master ]
paths: [ 'apidoc/**' ]

jobs:
regen:
if: github.event.pull_request.merged == true || github.event_name == 'workflow_dispatch'
runs-on: ubuntu-latest
name: Trigger Regen

steps:
- name: Checkout repository
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Setup node
uses: actions/setup-node@v2
with:
node-version: '16'
registry-url: 'https://registry.npmjs.org'

- name: Install dependencies
run: npm ci
if: steps.node-cache.outputs.cache-hit != 'true'

- run: npm run lint:docs
name: Lint

- name: Repository Dispatch
uses: peter-evans/repository-dispatch@v2
with:
event-type: regen-api-docs
token: ${{ secrets.REGEN_DOCS_GITHUB_TOKEN }}
repository: tidev/titanium-docs
4 changes: 2 additions & 2 deletions ios/Classes/TiBarcodeModule.m
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ - (id)_initWithPageContext:(id<TiEvaluator>)context

- (NSNumber *)canShow:(id)unused
{
//TO DO: Remove
// TO DO: Remove
return NUMBOOL(YES);
}

Expand Down Expand Up @@ -561,7 +561,7 @@ - (void)cancelled
MAKE_SYSTEM_PROP(FORMAT_RSS_EXPANDED, kBarcodeFormatRSSExpanded);
MAKE_SYSTEM_PROP(FORMAT_UPC_A, kBarcodeFormatUPCA);
MAKE_SYSTEM_PROP(FORMAT_UPC_E, kBarcodeFormatUPCE);
//MAKE_SYSTEM_PROP(FORMAT_UPCEAN_EXTENSION, kBarcodeFormatUPCEANExtension); // extension, not a stand-alone
// MAKE_SYSTEM_PROP(FORMAT_UPCEAN_EXTENSION, kBarcodeFormatUPCEANExtension); // extension, not a stand-alone

MAKE_SYSTEM_PROP(UNKNOWN, 0);
MAKE_SYSTEM_PROP(URL, 1);
Expand Down
Loading

0 comments on commit 52abb7b

Please sign in to comment.