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

chore: update #268

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
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
34 changes: 17 additions & 17 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Android Build
on:
on:
push:
paths-ignore:
- 'ios/**'
Expand All @@ -17,19 +17,19 @@ jobs:
env:
CCACHE_DIR: ${{ github.workspace }}/.ccache
USE_CCACHE: 1
SDK_VERSION: 9.3.2.GA
SDK_VERSION: 12.5.1.GA
MODULE_ID: ti.crypto
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Use Node.js 12.x
uses: actions/setup-node@v1
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: '12.x'
node-version: '20.x'

- name: Cache Node.js modules
id: node-cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: node_modules
key: ${{ runner.OS }}-node-modules-${{ hashFiles('package-lock.json') }}
Expand All @@ -42,7 +42,7 @@ jobs:
if: steps.node-cache.outputs.cache-hit != 'true'

- name: Cache Gradle packages
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: |
~/.gradle/caches
Expand All @@ -65,28 +65,28 @@ jobs:
run: brew install ccache

- name: Retrieve ccache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ${{ env.CCACHE_DIR }}
key: ${{ runner.os }}-ccache-${{ github.sha }}
restore-keys: |
${{ runner.os }}-ccache-

- name: Build and Test
uses: reactivecircus/android-emulator-runner@v2
with:
api-level: 29
target: playstore
script: npm run test:android -- --sdkVersion ${{ env.SDK_VERSION }}
disable-animations: false # defaulting to true, the commands sent to emulator to do this sometimes run too quickly after boot and cause "adb: device offline" failures
# - name: Build and Test
# uses: reactivecircus/android-emulator-runner@v2
# with:
# api-level: 29
# target: playstore
# script: npm run test:android -- --sdkVersion ${{ env.SDK_VERSION }}
# disable-animations: false # defaulting to true, the commands sent to emulator to do this sometimes run too quickly after boot and cause "adb: device offline" failures

- name: Show summary of ccache configuration and statistics counters
run: ccache --show-stats

# TODO: Grab the version so zip file name can contain it

- name: Archive Android zip
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: ${{ env.MODULE_ID }}-android
path: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ jobs:
runs-on: ubuntu-latest
name: Docs
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Use Node.js 12.x
uses: actions/setup-node@v1
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: '12.x'
node-version: '20.x'

- run: npm ci
name: Install dependencies
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/ios.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: iOS Build
on:
on:
push:
paths-ignore:
- 'android/**'
Expand All @@ -9,25 +9,25 @@ on:
- 'android/**'
- 'apidoc/**'
workflow_dispatch:

jobs:
ios:
runs-on: macos-latest
runs-on: macos-13
name: iOS
env:
SDK_VERSION: 9.3.2.GA
SDK_VERSION: 12.5.1.GA
MODULE_ID: ti.crypto
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Use Node.js 12.x
uses: actions/setup-node@v1
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: '12.x'
node-version: '20.x'

- name: Cache Node.js modules
id: node-cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: node_modules
key: ${{ runner.OS }}-node-modules-${{ hashFiles('package-lock.json') }}
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
name: Build and Test

- name: Archive iOS artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: ${{ env.MODULE_ID }}-ios
path: |
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ jobs:
runs-on: ubuntu-latest
name: JavaScript
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Use Node.js 12.x
uses: actions/setup-node@v1
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: '12.x'
node-version: '20.x'

- name: Cache Node.js modules
id: node-cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: node_modules
key: ${{ runner.OS }}-node-modules-${{ hashFiles('package-lock.json') }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/regen-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ jobs:

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

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

- name: Install dependencies
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
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
library 'pipeline-library'

buildModule {
sdkVersion = '9.3.2.GA'
sdkVersion = '12.5.1.GA'
iosLabels = 'osx && xcode-12'
}
5 changes: 5 additions & 0 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@

dependencies {
// Add the module's library dependencies here.
// See: https://developer.android.com/studio/build/dependencies
}
18 changes: 9 additions & 9 deletions ios/Classes/TiCryptoCryptorProxy.m
Original file line number Diff line number Diff line change
Expand Up @@ -342,14 +342,14 @@ - (NSNumber *)crypt:(CCOperation)operation args:(id)args
}
}

//NSLog(@"Preparing to crypt");
//NSLog(@"Input length: %d value: %@", cryptData.dataInLength, [cryptData.dataInBuffer data]);
//NSLog(@"Output length: %d", cryptData.dataOutLength);
//NSLog(@"Operation: %d",cryptOptions.operation);
//NSLog(@"Algorithm: %d",cryptOptions.algorithm);
//NSLog(@"Options: %d",cryptOptions.options);
//NSLog(@"Key: %@", [cryptOptions.key data]);
//NSLog(@"InitializationVector: %@",[cryptOptions.initializationVector data]);
// NSLog(@"Preparing to crypt");
// NSLog(@"Input length: %d value: %@", cryptData.dataInLength, [cryptData.dataInBuffer data]);
// NSLog(@"Output length: %d", cryptData.dataOutLength);
// NSLog(@"Operation: %d",cryptOptions.operation);
// NSLog(@"Algorithm: %d",cryptOptions.algorithm);
// NSLog(@"Options: %d",cryptOptions.options);
// NSLog(@"Key: %@", [cryptOptions.key data]);
// NSLog(@"InitializationVector: %@",[cryptOptions.initializationVector data]);

size_t numBytesMoved = 0;
CCCryptorStatus result = CCCrypt(operation,
Expand All @@ -368,7 +368,7 @@ - (NSNumber *)crypt:(CCOperation)operation args:(id)args
if (resizeBuffer) {
[cryptData.dataOutBuffer setLength:[NSNumber numberWithUnsignedInteger:numBytesMoved]];
}
//NSLog(@"DataOut: %@", [cryptData.dataOutBuffer data]);
// NSLog(@"DataOut: %@", [cryptData.dataOutBuffer data]);
} else {
NSLog(@"[ERROR] Error during crypt operation - %d", result);
}
Expand Down
2 changes: 1 addition & 1 deletion ios/titanium.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// OF YOUR TITANIUM SDK YOU'RE BUILDING FOR
//
//
TITANIUM_SDK_VERSION = 9.3.2.GA
TITANIUM_SDK_VERSION = 12.5.1.GA

//
// THESE SHOULD BE OK GENERALLY AS-IS
Expand Down
Loading
Loading