Skip to content

Commit

Permalink
Merge branch 'master' into revert-13512-revert-13279-textfield
Browse files Browse the repository at this point in the history
  • Loading branch information
m1ga authored Jun 20, 2023
2 parents 5117e59 + 39e971f commit a0a6420
Show file tree
Hide file tree
Showing 252 changed files with 25,632 additions and 16,987 deletions.
6 changes: 3 additions & 3 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ Hey there!
Thank you for the interest in contributing. We'd like to review and possibly merge as soon as possible. For this to happen, please make sure the following is in order:

- [x] Follow the instructions stated in [Contributing to Titanium](https://github.com/tidev/organization-docs/blob/main/AUTHORIZED_CONTRIBUTORS.md), including the request to squash commits, include unit tests and use clear commit titles (this will be your legacy!)
- [x] If you are fixing an issue that already has a [GitHub Issue](https://github.com/tidev/titanium_mobile/issues), include the URL in your PR description
- [x] If you are fixing an issue that has no GitHub issue, create a [new issue](https://github.com/tidev/titanium_mobile/issues/new/choose) and include the URL in your PR description
- [x] If you are fixing an issue that already has a [GitHub Issue](https://github.com/tidev/titanium-sdk/issues), include the URL in your PR description
- [x] If you are fixing an issue that has no GitHub issue, create a [new issue](https://github.com/tidev/titanium-sdk/issues/new/choose) and include the URL in your PR description
- [x] Use a clear title, e.g. prefixing it with the GitHub Issue number and platform

That's it, you are good to go! If you have any further questions or problems, feel free to ask us on [Ti.Slack](https://slack.tidev.io) or [GitHub Discussions](https://github.com/tidev/titanium_mobile/discussions).
That's it, you are good to go! If you have any further questions or problems, feel free to ask us on [Ti.Slack](https://slack.tidev.io) or [GitHub Discussions](https://github.com/tidev/titanium-sdk/discussions).

Code strong! :rocket:
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
contact_links:
- name: Github Discussions
url: https://github.com/tidev/titanium_mobile/discussions
url: https://github.com/tidev/titanium-sdk/discussions
about: Ask a question in Github Discussions
- name: TiDev
url: https://slack.tidev.io
Expand Down
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
**GitHub discussions:** https://github.com/tidev/titanium_mobile/discussions/[ID]
**GitHub discussions:** https://github.com/tidev/titanium-sdk/discussions/[ID]

Provide a clear PR title prefixed with `[ID]`

Expand Down
19 changes: 11 additions & 8 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 All @@ -20,13 +20,13 @@ runs:
shell: bash

- name: Setup Node.js
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ inputs.node-version }}
cache: 'npm'

- name: Setup Java
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
distribution: 'adopt'
java-version: ${{ inputs.java-version }}
Expand All @@ -36,7 +36,7 @@ runs:
shell: bash

- name: Cache Gradle packages
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
~/.gradle/caches
Expand All @@ -49,20 +49,24 @@ 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

- name: Retrieve ccache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ${{ env.CCACHE_DIR }}
key: ${{ runner.os }}-ccache-${{ github.sha }}
restore-keys: |
${{ runner.os }}-ccache-
- name: Cache V8
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: dist/android/libv8
key: libv8-${{ hashFiles('dist/android/libv8/**') }}
Expand All @@ -88,7 +92,7 @@ runs:
dist/tmp/common
shell: bash

- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
name: android-build
retention-days: 1
Expand All @@ -101,4 +105,3 @@ runs:
rm -f ~/.gradle/caches/modules-2/modules-2.lock
rm -f ~/.gradle/caches/modules-2/gc.properties
shell: bash

8 changes: 4 additions & 4 deletions .github/actions/build-ios/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ inputs:
runs:
using: composite
steps:
- name: Use Node.js 12.x
uses: actions/setup-node@v2
- name: Use Node.js 16.x
uses: actions/setup-node@v3
with:
node-version: '16.x'
cache: 'npm'
Expand All @@ -21,7 +21,7 @@ runs:

- name: Lint
run: npm run lint:ios
shell: bash
shell: bash

- name: Build
run: npm run build:ios
Expand All @@ -34,7 +34,7 @@ runs:
iphone/TitaniumKit/build/TitaniumKit.xcframework
shell: bash

- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
name: ios-build
retention-days: 1
Expand Down
22 changes: 11 additions & 11 deletions .github/actions/package/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ inputs:
runs:
using: composite
steps:
- name: Use Node.js 12.x
uses: actions/setup-node@v2
- name: Use Node.js 16.x
uses: actions/setup-node@v3
with:
node-version: ${{ inputs.node-version }}
cache: 'npm'

- name: Use JDK 11
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
distribution: 'adopt'
java-version: ${{ inputs.java-version }}
Expand All @@ -32,7 +32,7 @@ runs:
shell: bash

- name: Cache Gradle packages
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
~/.gradle/caches
Expand All @@ -41,15 +41,15 @@ runs:
restore-keys: |
${{ runner.os }}-gradle-
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
with:
name: android-build

- name: Extract Android build output
run: tar -xzvf android-build.tar.gz
shell: bash

- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
with:
name: ios-build

Expand All @@ -58,7 +58,7 @@ runs:
shell: bash

- name: Cache Native Modules
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ${{ env.SDK_BUILD_CACHE_DIR }}
key: native-modules-${{ github.sha }}
Expand All @@ -70,21 +70,21 @@ runs:
shell: bash

- name: Archive OSX artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: mobilesdk-${{ inputs.vtag }}-osx
path: |
dist/mobilesdk-*-osx.zip
- name: Archive win32 artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: mobilesdk-${{ inputs.vtag }}-win32
path: |
dist/mobilesdk-*-win32.zip
- name: Archive Linux artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: mobilesdk-${{ inputs.vtag }}-linux
path: |
Expand All @@ -98,7 +98,7 @@ runs:
rm -f ~/.gradle/caches/modules-2/gc.properties
shell: bash

- uses: geekyeggo/delete-artifact@v1
- uses: geekyeggo/delete-artifact@v2
with:
name: |
android-build
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.
2 changes: 1 addition & 1 deletion .github/workflows/backport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
backport:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
name: Backport
steps:
- name: Backport
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
android:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
env:
CCACHE_DIR: ${{ github.workspace }}/.ccache
USE_CCACHE: 1
Expand All @@ -25,12 +25,12 @@ jobs:
java-version: '11'

ios:
runs-on: macos-11
runs-on: macos-13
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.3.app/Contents/Developer
steps:
- name: Checkout repository
uses: actions/checkout@v3
Expand All @@ -50,8 +50,8 @@ jobs:
with:
fetch-depth: 0

- name: Use Node.js 12.x
uses: actions/setup-node@v2
- name: Use Node.js 16.x
uses: actions/setup-node@v3
with:
node-version: '16.x'
cache: 'npm'
Expand All @@ -61,13 +61,13 @@ jobs:

- name: Lint
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
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Use Node.js 12.x
uses: actions/setup-node@v2
- name: Use Node.js 16.x
uses: actions/setup-node@v3
with:
node-version: '16.x'
cache: 'npm'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/regen-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
fetch-depth: 0

- name: Setup node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: '16'
registry-url: 'https://registry.npmjs.org'
Expand All @@ -30,7 +30,7 @@ jobs:

- run: npm run lint:docs
name: Lint

- name: Repository Dispatch
uses: peter-evans/repository-dispatch@v2
with:
Expand Down
Loading

0 comments on commit a0a6420

Please sign in to comment.