ea9d3607cb
Summary: Bumps [Java-WebSocket](https://github.com/TooTallNate/Java-WebSocket) from 1.5.1 to 1.5.2. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/TooTallNate/Java-WebSocket/releases">Java-WebSocket's releases</a>.</em></p> <blockquote> <h2>Release 1.5.2</h2> <h4>Notable changes:</h4> <ul> <li><a href="https://github-redirect.dependabot.com/TooTallNate/Java-WebSocket/issues/1008">Issue 1008</a> - Improve Sec-WebSocket-Protocol usability (<a href="https://github-redirect.dependabot.com/TooTallNate/Java-WebSocket/pull/1034">PR 1034 </a> by <a href="https://github.com/marci4"><code>@marci4</code></a>)</li> <li><a href="https://github-redirect.dependabot.com/TooTallNate/Java-WebSocket/pull/1070">PR 1070</a> - Prioritise using provided socket factory when creating socket with proxy, by <a href="https://github.com/marci4"><code>@marci4</code></a></li> <li><a href="https://github-redirect.dependabot.com/TooTallNate/Java-WebSocket/issues/1026">Issue 1026</a> - Force client to use the valid schema (<a href="https://github-redirect.dependabot.com/TooTallNate/Java-WebSocket/pull/1025">PR 1025 </a> by <a href="https://github.com/yindex"><code>@yindex</code></a>)</li> </ul> <p>Check out the <a href="https://github.com/TooTallNate/Java-WebSocket/blob/master/CHANGELOG.md#version-release-152-20210405">changelog</a> and the <a href="https://github.com/TooTallNate/Java-WebSocket/milestone/18?closed=1">milestone</a> for more information.</p> <p>A special thanks to all the contributors of this release: <a href="https://github.com/dota17"><code>@dota17</code></a> <a href="https://github.com/yindex"><code>@yindex</code></a> <a href="https://github.com/alphaho"><code>@alphaho</code></a> <a href="https://github.com/pawankgupta-se"><code>@pawankgupta-se</code></a></p> </blockquote> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/TooTallNate/Java-WebSocket/blob/master/CHANGELOG.md">Java-WebSocket's changelog</a>.</em></p> <blockquote> <h2>Version Release 1.5.2 (2021/04/05)</h2> <h4>Bugs Fixed</h4> <ul> <li><a href="https://github-redirect.dependabot.com/TooTallNate/Java-WebSocket/issues/1132">Issue 1132</a> - Draft_6455 flagged by Veracode CWE-331 replace Random with SecureRandom (<a href="https://github-redirect.dependabot.com/TooTallNate/Java-WebSocket/pull/1133">PR 1133 </a> by <a href="https://github.com/marci4"><code>@marci4</code></a>)</li> <li><a href="https://github-redirect.dependabot.com/TooTallNate/Java-WebSocket/issues/1053">Issue 1053</a> - It's an invalid check null with SEC_WEB_SOCKET_KEY . (<a href="https://github-redirect.dependabot.com/TooTallNate/Java-WebSocket/pull/1054">PR 1054 </a> by <a href="https://github.com/dota17"><code>@dota17</code></a>)</li> <li><a href="https://github-redirect.dependabot.com/TooTallNate/Java-WebSocket/issues/1026">Issue 1026</a> - Force client to use the valid schema (<a href="https://github-redirect.dependabot.com/TooTallNate/Java-WebSocket/pull/1025">PR 1025 </a> by <a href="https://github.com/yindex"><code>@yindex</code></a>)</li> <li><a href="https://github-redirect.dependabot.com/TooTallNate/Java-WebSocket/pull/1070">PR 1070</a> - Prioritise using provided socket factory when creating socket with proxy, by <a href="https://github.com/marci4"><code>@marci4</code></a></li> <li><a href="https://github-redirect.dependabot.com/TooTallNate/Java-WebSocket/pull/1028">PR 1028</a> - Fixed typo in WebSocketClient.reset's error message, by <a href="https://github.com/alphaho"><code>@alphaho</code></a></li> <li><a href="https://github-redirect.dependabot.com/TooTallNate/Java-WebSocket/pull/1018">PR 1018</a> - Added missing return character, by <a href="https://github.com/pawankgupta-se"><code>@pawankgupta-se</code></a></li> </ul> <h4>New Features</h4> <ul> <li><a href="https://github-redirect.dependabot.com/TooTallNate/Java-WebSocket/issues/1008">Issue 1008</a> - Improve Sec-WebSocket-Protocol usability (<a href="https://github-redirect.dependabot.com/TooTallNate/Java-WebSocket/pull/1034">PR 1034 </a> by <a href="https://github.com/marci4"><code>@marci4</code></a>)</li> </ul> <h4>Refactoring</h4> <ul> <li><a href="https://github-redirect.dependabot.com/TooTallNate/Java-WebSocket/issues/1050">Issue 1050</a> - What about adding the CodeFormatterProfile.xml with the code format ? (<a href="https://github-redirect.dependabot.com/TooTallNate/Java-WebSocket/pull/1060">PR 1060 </a> by <a href="https://github.com/dota17"><code>@dota17</code></a>)</li> <li><a href="https://github-redirect.dependabot.com/TooTallNate/Java-WebSocket/pull/1072">PR 1072</a> - Improve code quality, by <a href="https://github.com/marci4"><code>@marci4</code></a></li> <li><a href="https://github-redirect.dependabot.com/TooTallNate/Java-WebSocket/pull/1060">PR 1060</a> - Using Google Java Code Style To Reformat Code, by <a href="https://github.com/dota17"><code>@dota17</code></a></li> </ul> <p>In this release 5 issues and 9 pull requests were closed.</p> <p>###############################################################################</p> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="e630e60168"><code>e630e60</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/TooTallNate/Java-WebSocket/issues/1137">https://github.com/facebook/flipper/issues/1137</a> from marci4/UpdateChangelog1.5.2</li> <li><a href="2b33f4208c"><code>2b33f42</code></a> Update Changelog.md</li> <li><a href="6e1d80fe8f"><code>6e1d80f</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/TooTallNate/Java-WebSocket/issues/1136">https://github.com/facebook/flipper/issues/1136</a> from PhilipRoman/gradle-build-fix</li> <li><a href="a25bce4a52"><code>a25bce4</code></a> Switch from deprecated Gradle 'compile' configuration to 'implementation'</li> <li><a href="9e5b79527e"><code>9e5b795</code></a> Replace deprecated Gradle 'maven' plugin with 'maven-publish'</li> <li><a href="234a86545d"><code>234a865</code></a> Configure Gradle to use utf-8</li> <li><a href="d0f57313cb"><code>d0f5731</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/TooTallNate/Java-WebSocket/issues/1133">https://github.com/facebook/flipper/issues/1133</a> from marci4/Issue1132</li> <li><a href="feec867c81"><code>feec867</code></a> Use SecureRandom instead of Random</li> <li><a href="25af097633"><code>25af097</code></a> Remove unused code and clean up build.gradle</li> <li><a href="b08342884c"><code>b083428</code></a> Set compatibility in build.gradle to 1.7</li> <li>Additional commits viewable in <a href="https://github.com/TooTallNate/Java-WebSocket/compare/v1.5.1...v1.5.2">compare view</a></li> </ul> </details> <br /> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `dependabot rebase` will rebase this PR - `dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `dependabot merge` will merge this PR after your CI passes on it - `dependabot squash and merge` will squash and merge this PR after your CI passes on it - `dependabot cancel merge` will cancel a previously requested merge and block automerging - `dependabot reopen` will reopen this PR if it is closed - `dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Pull Request resolved: https://github.com/facebook/flipper/pull/3054 Reviewed By: mweststrate Differential Revision: D32529290 Pulled By: passy fbshipit-source-id: a269c43fba575ed82cbb06300961911cf2ab182d
109 lines
4.8 KiB
Groovy
109 lines
4.8 KiB
Groovy
/*
|
|
* Copyright (c) Facebook, Inc. and its affiliates.
|
|
*
|
|
* This source code is licensed under the MIT license found in the
|
|
* LICENSE file in the root directory of this source tree.
|
|
*/
|
|
|
|
buildscript {
|
|
repositories {
|
|
google()
|
|
mavenCentral()
|
|
}
|
|
dependencies {
|
|
classpath 'com.android.tools.build:gradle:4.2.2'
|
|
classpath 'com.vanniktech:gradle-maven-publish-plugin:0.18.0'
|
|
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
|
|
classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.5.31"
|
|
}
|
|
}
|
|
|
|
plugins {
|
|
id 'de.undercouch.download' version '4.1.2'
|
|
id 'com.github.ben-manes.versions' version '0.39.0'
|
|
}
|
|
|
|
ext.isSnapshot = { VERSION_NAME.endsWith('-SNAPSHOT') }
|
|
ext.isRelease = { ['publish', 'publishToMavenLocal'].any { gradle.startParameter.taskNames.contains(it) } }
|
|
|
|
subprojects {
|
|
repositories {
|
|
google()
|
|
mavenLocal()
|
|
mavenCentral()
|
|
jcenter()
|
|
|
|
if (isSnapshot()) {
|
|
maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
|
|
}
|
|
}
|
|
|
|
// We don't build Javadoc at this time.
|
|
tasks.withType(Javadoc).all {
|
|
enabled = false
|
|
}
|
|
}
|
|
|
|
ext {
|
|
minSdkVersion = 15
|
|
targetSdkVersion = 30
|
|
compileSdkVersion = 30
|
|
buildToolsVersion = '30.0.2'
|
|
ndkVersion = '23.0.7599858'
|
|
}
|
|
|
|
ext.deps = [
|
|
// Android support
|
|
supportAnnotations : "androidx.annotation:annotation:$ANDROIDX_VERSION",
|
|
supportAppCompat : "androidx.appcompat:appcompat:$ANDROIDX_VERSION",
|
|
supportCoreUi : "androidx.legacy:legacy-support-core-ui:$ANDROIDX_VERSION",
|
|
supportRecyclerView: "androidx.recyclerview:recyclerview:$ANDROIDX_VERSION",
|
|
supportConstraintLayout: "androidx.constraintlayout:constraintlayout:2.1.1",
|
|
supportSqlite : "androidx.sqlite:sqlite-framework:2.1.0",
|
|
supportEspresso : 'androidx.test.espresso:espresso-core:3.4.0',
|
|
supportEspressoIntents : 'androidx.test.espresso:espresso-intents:3.4.0',
|
|
supportTestRunner : 'androidx.test:runner:1.4.0',
|
|
// Arch
|
|
archPaging : 'android.arch.paging:runtime:1.0.1',
|
|
// First-party
|
|
soloader : 'com.facebook.soloader:soloader:0.10.3',
|
|
fbjni : 'com.facebook.fbjni:fbjni:0.2.2',
|
|
screenshot : 'com.facebook.testing.screenshot:core:0.14.0',
|
|
boltsTasks : 'com.parse.bolts:bolts-tasks:1.4.0',
|
|
websocket : 'org.java-websocket:Java-WebSocket:1.5.2',
|
|
// Annotations
|
|
jsr305 : 'com.google.code.findbugs:jsr305:3.0.2',
|
|
inferAnnotations : 'com.facebook.infer.annotation:infer-annotation:0.18.0',
|
|
proguardAnnotations: 'com.facebook.yoga:proguard-annotations:1.19.0',
|
|
// Litho
|
|
lithoAnnotations : "com.facebook.litho:litho-annotations:$LITHO_VERSION",
|
|
lithoCore : "com.facebook.litho:litho-core:$LITHO_VERSION",
|
|
lithoEditorCore : "com.facebook.litho:litho-editor-core:$LITHO_VERSION",
|
|
lithoEditorFlipper : "com.facebook.litho:litho-editor-flipper:$LITHO_VERSION",
|
|
lithoSectionsAnnotations: "com.facebook.litho:litho-sections-annotations:$LITHO_VERSION",
|
|
lithoSectionsDebug : "com.facebook.litho:litho-sections-debug:$LITHO_VERSION",
|
|
lithoSectionsCore : "com.facebook.litho:litho-sections-core:$LITHO_VERSION",
|
|
lithoSectionsWidget : "com.facebook.litho:litho-sections-widget:$LITHO_VERSION",
|
|
lithoWidget : "com.facebook.litho:litho-widget:$LITHO_VERSION",
|
|
lithoProcessor : "com.facebook.litho:litho-processor:$LITHO_VERSION",
|
|
lithoSectionsProcessor: "com.facebook.litho:litho-sections-processor:$LITHO_VERSION",
|
|
lithoFresco : "com.facebook.litho:litho-fresco:$LITHO_VERSION",
|
|
lithoTesting : "com.facebook.litho:litho-testing:$LITHO_VERSION",
|
|
// Debugging and testing
|
|
guava : 'com.google.guava:guava:23.0',
|
|
robolectric : 'org.robolectric:robolectric:4.5.1',
|
|
junit : 'junit:junit:4.13.2',
|
|
hamcrest : 'org.hamcrest:hamcrest-library:2.2',
|
|
mockito : 'org.mockito:mockito-core:4.0.0',
|
|
okhttp3 : 'com.squareup.okhttp3:okhttp:4.9.2',
|
|
leakcanary : 'com.squareup.leakcanary:leakcanary-android:1.6.3',
|
|
leakcanary2 : 'com.squareup.leakcanary:leakcanary-android:2.6',
|
|
protobuf : 'com.google.protobuf:protobuf-java:3.19.1',
|
|
testCore : 'androidx.test:core:1.4.0',
|
|
testRules : 'androidx.test:rules:1.4.0',
|
|
// Plugin dependencies
|
|
frescoFlipper : 'com.facebook.fresco:flipper:2.6.0',
|
|
frescoStetho : 'com.facebook.fresco:stetho:2.6.0',
|
|
fresco : 'com.facebook.fresco:fresco:2.6.0'
|
|
]
|