Skip to content

Commit 92d4c00

Browse files
dep upgrade (#481)
OKTA-1197653 fix: netty upgrade
1 parent 3e76386 commit 92d4c00

6 files changed

Lines changed: 22 additions & 23 deletions

File tree

.bacon.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,11 @@ test_suites:
2020
script_name: publish
2121
criteria: MERGE
2222
queue_name: ci-queue-productionJenga-AL2023
23+
- name: snyk
24+
script_path: /root/okta/okta-react-native/scripts
25+
script_name: snyk
26+
sort_order: '4'
27+
timeout: '200'
28+
criteria: MAINLINE
29+
queue_name: ci-queue-productionJenga-AL2023
30+
trigger: AUTO

.github/workflows/okta-react-native.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ jobs:
2323
run: yarn lint
2424
- name: Test
2525
run: yarn test
26-
- name: Execute snyk.sh
27-
run: bash ./scripts/snyk.sh
2826
iOSUnitTests:
2927
runs-on: macos-latest
3028
steps:
@@ -52,7 +50,7 @@ jobs:
5250
xcodebuild \
5351
-workspace ios/ReactNativeOktaSdkBridge.xcworkspace \
5452
-scheme "ReactNativeOktaSdkBridge" \
55-
-destination "platform=iOS Simulator,OS=17.4,name=iPhone 15" \
53+
-destination "platform=iOS Simulator,OS=26.5,name=iPhone 17" \
5654
clean test | xcpretty
5755
# iOSUITests:
5856
# runs-on: macos-12

android/forceVersions.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ def forceVersions(ConfigurationContainer configurations) {
22
configurations.configureEach { configuration ->
33
configuration.resolutionStrategy {
44
force 'org.bouncycastle:bcprov-jdk18on:1.78.1'
5-
force 'io.netty:netty-handler:4.1.125.Final'
6-
force 'io.netty:netty-codec-http:4.1.125.Final'
7-
force 'io.netty:netty-codec-http2:4.1.125.Final'
5+
force 'io.netty:netty-handler:4.1.135.Final'
6+
force 'io.netty:netty-codec-http:4.1.135.Final'
7+
force 'io.netty:netty-codec-http2:4.1.135.Final'
88
force 'com.google.protobuf:protobuf-java:4.29.3'
99
}
1010
}

e2e/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ buildscript {
1111
targetSdkVersion = Integer.parseInt(findProperty('android.targetSdkVersion') ?: '34')
1212
kotlinVersion = findProperty('android.kotlinVersion') ?: '1.9.25'
1313

14-
ndkVersion = "26.1.10909125"
14+
ndkVersion = "27.1.12297006"
1515
}
1616
repositories {
1717
google()

e2e/android/forceVersions.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ def forceVersions(ConfigurationContainer configurations) {
1313
force 'junit:junit:4.13.2'
1414
force 'commons-io:commons-io:2.15.1'
1515
force 'commons-codec:commons-codec:1.17.0'
16-
force 'io.netty:netty-handler:4.1.125.Final'
17-
force 'io.netty:netty-codec-http:4.1.125.Final'
18-
force 'io.netty:netty-codec-http2:4.1.125.Final'
16+
force 'io.netty:netty-handler:4.1.135.Final'
17+
force 'io.netty:netty-codec-http:4.1.135.Final'
18+
force 'io.netty:netty-codec-http2:4.1.135.Final'
1919
force 'com.google.protobuf:protobuf-java:3.25.6'
2020
}
2121
}

scripts/snyk.sh

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
1-
#!/bin/bash
1+
#!/bin/bash -x
22

3-
# When packages change their dependency tree, we want to run snyk monitor. This
4-
# sends the updated dependency tree to snyk for monitoring. We want to do this
5-
# when a commit has been made to master, not on PRs because the dependency tree
6-
# is likely still in flux while review is happening.
7-
#
8-
# For simplicity, this script just runs snyk monitor against all packages on
9-
# master commits, it doesn't try to figure out which packages were updated.
3+
source ${OKTA_HOME}/${REPO}/scripts/setup.sh
4+
5+
create_log_group "Snyk Scan"
6+
dependency_scan
7+
finish_log_group $?
108

11-
if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]]; then
12-
yarn global add snyk
13-
snyk auth $SNYK_API_TOKEN
14-
echo "snyk monitor --org=$SNYK_ORG_ID"
15-
fi

0 commit comments

Comments
 (0)