Skip to content

Commit

Permalink
Merge branch 'master' into tabmode
Browse files Browse the repository at this point in the history
  • Loading branch information
m1ga authored Mar 30, 2023
2 parents a7a9721 + 34da923 commit 4ad56c1
Show file tree
Hide file tree
Showing 334 changed files with 24,376 additions and 16,659 deletions.
7 changes: 5 additions & 2 deletions .github/actions/build-android/action.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Android Build
description: Installs required dependencies and then builds the Android side of the SDK
description: Installs required dependencies and then builds the Android side of the SDK

inputs:
node-version:
Expand Down Expand Up @@ -49,6 +49,10 @@ runs:
run: npm run lint:android
shell: bash

- name: Set up Homebrew
id: set-up-homebrew
uses: Homebrew/actions/setup-homebrew@master

- name: Install ccache
run: brew install ccache
shell: bash
Expand Down Expand Up @@ -101,4 +105,3 @@ runs:
rm -f ~/.gradle/caches/modules-2/modules-2.lock
rm -f ~/.gradle/caches/modules-2/gc.properties
shell: bash

2 changes: 1 addition & 1 deletion .github/actions/build-ios/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ inputs:
runs:
using: composite
steps:
- name: Use Node.js 12.x
- name: Use Node.js 16.x
uses: actions/setup-node@v2
with:
node-version: '16.x'
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/package/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ inputs:
runs:
using: composite
steps:
- name: Use Node.js 12.x
- name: Use Node.js 16.x
uses: actions/setup-node@v2
with:
node-version: ${{ inputs.node-version }}
Expand Down
Binary file modified .github/logo-titanium.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
41 changes: 41 additions & 0 deletions .github/logo-titanium.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ jobs:
java-version: '11'

ios:
runs-on: macos-11
runs-on: macos-12
name: iOS
env:
CCACHE_DIR: ${{ github.workspace }}/.ccache
USE_CCACHE: 1
DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
steps:
- name: Checkout repository
uses: actions/checkout@v3
Expand All @@ -50,7 +50,7 @@ jobs:
with:
fetch-depth: 0

- name: Use Node.js 12.x
- name: Use Node.js 16.x
uses: actions/setup-node@v2
with:
node-version: '16.x'
Expand All @@ -63,11 +63,11 @@ jobs:
run: npm run lint:js

package:
runs-on: macos-11
runs-on: macos-12
name: Package
env:
SDK_BUILD_CACHE_DIR: ${{ github.workspace }}/.native-modules
DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
needs: [android, ios, js]
steps:
- name: Checkout repository
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Use Node.js 12.x
- name: Use Node.js 16.x
uses: actions/setup-node@v2
with:
node-version: '16.x'
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
PACKAGE_VERSION=$(sed -n 's/^ *"version": *"//p' package.json | tr -d '"' | tr -d ',' | tr -d '[[:space:]]')
VTAG="${PACKAGE_VERSION}.${{ github.event.inputs.release-type }}"
echo "vtag=${VTAG}" >> $GITHUB_ENV
echo "::set-output name=vtag::${VTAG}"
echo "vtag=${VTAG}" >> $GITHUB_OUTPUT
- name: Validate version
uses: actions/github-script@v5
env:
Expand Down Expand Up @@ -75,13 +75,13 @@ jobs:
java-version: '11'

ios:
runs-on: macos-11
runs-on: macos-12
name: iOS
needs: [validate]
env:
CCACHE_DIR: ${{ github.workspace }}/.ccache
USE_CCACHE: 1
DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
steps:
- name: Checkout repository
uses: actions/checkout@v3
Expand All @@ -94,11 +94,11 @@ jobs:
node-version: '16.x'

package:
runs-on: macos-11
runs-on: macos-12
name: Package
env:
SDK_BUILD_CACHE_DIR: ${{ github.workspace }}/.native-modules
DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
vtag: ${{ needs.validate.outputs.vtag }}
needs: [validate, android, ios]
steps:
Expand Down
9 changes: 7 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
npm-debug.log
/node_modules

# Android editor stuff (eclipse/VSCode)
# Android editor stuff (eclipse/VSCode/Android Studio)
/android/.project
/android/app/.classpath
/android/app/.project
Expand All @@ -25,6 +25,11 @@ npm-debug.log
/android/runtime/v8/src/native/V8Snapshots.h
/android/titanium/.classpath
/android/titanium/.project
/android/titanium/.idea/
/android/titanium/local.properties
/android/titanium.bindings.json
.idea/
/android/.idea/

# Build dirs
/dist
Expand Down Expand Up @@ -54,4 +59,4 @@ junit_report.xml
/tests/Resources/android/snapshots/1[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]_*.png

# VS Code History Extension
.history
.history
Loading

0 comments on commit 4ad56c1

Please sign in to comment.