Skip to content
This repository has been archived by the owner on Jan 15, 2021. It is now read-only.

Commit

Permalink
Dependabot prs (#127)
Browse files Browse the repository at this point in the history
* Bump junit-jupiter-engine from 5.2.0 to 5.4.2 (#83)

* Bump log4j-api from 2.11.0 to 2.11.2 (#81)

* Bump junit-platform-launcher from 1.2.0 to 1.4.2 (#79)

* Bump junit-jupiter-api from 5.2.0 to 5.4.2 (#84)

* Bump junit-jupiter-params from 5.2.0 to 5.4.2 (#80)

* Bump log4j-core from 2.11.0 to 2.11.2 (#77)

* Bump com.gradle.build-scan from 2.0.2 to 2.3 (#72)

* Bump edu.wpi.first.GradleJni from 0.3.1 to 0.9.0 (#94)

Bumps edu.wpi.first.GradleJni from 0.3.1 to 0.9.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump junit-platform-launcher from 1.5.0 to 1.5.1

Bumps [junit-platform-launcher](https://github.com/junit-team/junit5) from 1.5.0 to 1.5.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump junit-jupiter-engine from 5.5.0 to 5.5.1

Bumps [junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.5.0 to 5.5.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](junit-team/junit5@r5.5.0...r5.5.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump junit-jupiter-api from 5.5.0 to 5.5.1

Bumps [junit-jupiter-api](https://github.com/junit-team/junit5) from 5.5.0 to 5.5.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](junit-team/junit5@r5.5.0...r5.5.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump log4j-api from 2.12.0 to 2.12.1

Bumps log4j-api from 2.12.0 to 2.12.1.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump log4j-core from 2.12.0 to 2.12.1

Bumps log4j-core from 2.12.0 to 2.12.1.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump snakeyaml from 1.24 to 1.25

Bumps [snakeyaml](https://bitbucket.org/asomov/snakeyaml) from 1.24 to 1.25.
- [Commits](https://bitbucket.org/asomov/snakeyaml/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump com.diffplug.gradle.spotless from 3.23.0 to 3.24.2

Bumps com.diffplug.gradle.spotless from 3.23.0 to 3.24.2.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump com.gradle.build-scan from 2.3 to 2.4.1

Bumps com.gradle.build-scan from 2.3 to 2.4.1.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump com.github.spotbugs from 1.6.4 to 2.0.0

Bumps com.github.spotbugs from 1.6.4 to 2.0.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump junit-jupiter-params from 5.5.0 to 5.5.1

Bumps [junit-jupiter-params](https://github.com/junit-team/junit5) from 5.5.0 to 5.5.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](junit-team/junit5@r5.5.0...r5.5.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump junit-platform-launcher from 1.5.1 to 1.5.2

Bumps [junit-platform-launcher](https://github.com/junit-team/junit5) from 1.5.1 to 1.5.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump junit-jupiter-params from 5.5.1 to 5.5.2

Bumps [junit-jupiter-params](https://github.com/junit-team/junit5) from 5.5.1 to 5.5.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](junit-team/junit5@r5.5.1...r5.5.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump junit-jupiter-engine from 5.5.1 to 5.5.2

Bumps [junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.5.1 to 5.5.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](junit-team/junit5@r5.5.1...r5.5.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump junit-jupiter-api from 5.5.1 to 5.5.2

Bumps [junit-jupiter-api](https://github.com/junit-team/junit5) from 5.5.1 to 5.5.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](junit-team/junit5@r5.5.1...r5.5.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump net.ltgt.errorprone from 0.8.1 to 1.1.1

Bumps net.ltgt.errorprone from 0.8.1 to 1.1.1.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump edu.wpi.first.GradleJni from 0.9.0 to 0.10.1

Bumps edu.wpi.first.GradleJni from 0.9.0 to 0.10.1.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump com.gradle.build-scan from 2.4.1 to 3.1

Bumps com.gradle.build-scan from 2.4.1 to 3.1.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump com.diffplug.gradle.spotless from 3.24.2 to 3.26.1

Bumps com.diffplug.gradle.spotless from 3.24.2 to 3.26.1.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump com.github.spotbugs from 2.0.0 to 3.0.0

Bumps com.github.spotbugs from 2.0.0 to 3.0.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Fixing compilation issues
  • Loading branch information
pjreiniger authored Dec 4, 2019
1 parent f44f99e commit b0f3c49
Show file tree
Hide file tree
Showing 12 changed files with 31 additions and 26 deletions.
7 changes: 3 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,10 @@ buildscript {
}

plugins {
id 'net.ltgt.errorprone' version '0.8.1' apply false
id 'net.ltgt.errorprone' version '1.1.1' apply false
id 'edu.wpi.first.NativeUtils' version '2.1.2'
id 'edu.wpi.first.GradleJni' version '0.9.0' apply false
id 'edu.wpi.first.GradleJni' version '0.10.1' apply false
id "com.diffplug.gradle.spotless" version "3.24.2"
id 'com.gradle.build-scan' version '2.4.1'
id "com.github.spotbugs" version "2.0.0"
}
apply plugin: 'nebula-aggregate-javadocs'
Expand Down Expand Up @@ -115,5 +114,5 @@ if(hasProperty('maven_version'))
}

wrapper {
gradleVersion = '5.1'
gradleVersion = '6.0'
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions sim_adx_family/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ apply from: "${rootDir}/common/base_jni_script.gradle"
configurations.maybeCreate("wpilibNativeDeps")
dependencies {

testCompile 'org.junit.jupiter:junit-jupiter-api:5.5.1'
testCompile 'org.junit.jupiter:junit-jupiter-api:5.5.2'
testCompile 'org.junit.jupiter:junit-jupiter-params:5.5.1'
testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.5.1'
testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.5.2'
testRuntime 'org.junit.platform:junit-platform-launcher:1.5.1'

testCompile project(":snobot_sim_utilities")
Expand Down
4 changes: 2 additions & 2 deletions sim_extension_navx/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ model {
configurations.maybeCreate("wpilibNativeDeps")
dependencies {

testCompile 'org.junit.jupiter:junit-jupiter-api:5.5.1'
testCompile 'org.junit.jupiter:junit-jupiter-api:5.5.2'
testCompile 'org.junit.jupiter:junit-jupiter-params:5.5.1'
testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.5.1'
testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.5.2'
testRuntime 'org.junit.platform:junit-platform-launcher:1.5.1'
testCompile "com.kauailabs.navx.frc:navx-java:" + getNavxVersion()

Expand Down
6 changes: 3 additions & 3 deletions snobot_sim_gui/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ dependencies {
native3rdPartyDeps 'net.java.jinput:jinput:2.0.9'
compile 'jfree:jcommon:1.0.16'
compile 'jfree:jfreechart:1.0.13'
compile 'org.apache.logging.log4j:log4j-api:2.12.1'
compile 'org.apache.logging.log4j:log4j-core:2.12.1'
compile 'org.apache.logging.log4j:log4j-api:2.12.0'
compile 'org.apache.logging.log4j:log4j-core:2.12.0'
compile 'org.yaml:snakeyaml:1.25'
compile 'com.miglayout:miglayout-swing:5.2'
//compile 'org.python:jython:2.7.1b3'
Expand All @@ -57,7 +57,7 @@ dependencies {
}

// Test
testCompile 'org.junit.jupiter:junit-jupiter-api:5.5.1'
testCompile 'org.junit.jupiter:junit-jupiter-api:5.5.2'
testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.5.1'
testRuntime 'org.junit.platform:junit-platform-launcher:1.5.1'
runtime 'com.snobot.simulator:ctre_sim_override:' + getCtreSimVersion() + ':all'
Expand Down
8 changes: 4 additions & 4 deletions snobot_sim_java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ dependencies {
compile 'edu.wpi.first.cameraserver:cameraserver-java:' + allwpilibVersion()
compile 'edu.wpi.first.hal:hal-java:' + allwpilibVersion()
compile 'edu.wpi.first.wpilibj:wpilibj-java:' + allwpilibVersion()
compile 'org.apache.logging.log4j:log4j-api:2.12.1'
compile 'org.apache.logging.log4j:log4j-core:2.12.1'
compile 'org.apache.logging.log4j:log4j-api:2.12.0'
compile 'org.apache.logging.log4j:log4j-core:2.12.0'
compile 'org.yaml:snakeyaml:1.25'
compile project(":snobot_sim_utilities")
compile project(':sim_adx_family')
Expand All @@ -34,9 +34,9 @@ dependencies {
testRuntime 'com.snobot.simulator:ctre_sim_override:' + getCtreSimVersion() + ':all'
testRuntime 'com.snobot.simulator:rev_simulator:' + getRevRoboticsSimVersion() + ':all'

testCompile 'org.junit.jupiter:junit-jupiter-api:5.5.1'
testCompile 'org.junit.jupiter:junit-jupiter-api:5.5.2'
testCompile 'org.junit.jupiter:junit-jupiter-params:5.5.1'
testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.5.1'
testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.5.2'
testRuntime 'org.junit.platform:junit-platform-launcher:1.5.1'
testRuntime 'edu.wpi.first.wpiutil:wpiutil-java:' + getWpiUtilVersion()
testRuntime 'edu.wpi.first.ntcore:ntcore-jni:' + getNtCoreVersion() + ':all'
Expand Down
8 changes: 4 additions & 4 deletions snobot_sim_jni/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ dependencies {
compile 'edu.wpi.first.cscore:cscore-java:' + getCsCoreVersion()
compile 'edu.wpi.first.cameraserver:cameraserver-java:' + allwpilibVersion()

testCompile 'org.junit.jupiter:junit-jupiter-api:5.5.1'
testCompile 'org.junit.jupiter:junit-jupiter-api:5.5.2'
testCompile 'org.junit.jupiter:junit-jupiter-params:5.5.1'
testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.5.1'
testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.5.2'
testRuntime 'org.junit.platform:junit-platform-launcher:1.5.1'
testCompile 'org.junit.jupiter:junit-jupiter-api:5.5.1'
testCompile 'org.junit.jupiter:junit-jupiter-api:5.5.2'
testCompile 'org.junit.jupiter:junit-jupiter-params:5.5.1'
testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.5.1'
testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.5.2'

testCompile 'edu.wpi.first.wpilibj:wpilibj-java:' + allwpilibVersion()
testCompile 'edu.wpi.first.hal:hal-java:' + allwpilibVersion()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,13 @@ public static String getLibraryName()
return "CppTest";
}

public static native void createRobot();
public static void createRobot()
{
throw new RuntimeException("Not Supported");
}

public static native void startCompetition();
public static void startCompetition()
{
throw new RuntimeException("Not Supported");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ JNIEXPORT void JNICALL Java_com_snobot_simulator_jni_module_1wrapper_AnalogOutWr
* Method: getVoltage
* Signature: (I)D
*/
JNIEXPORT jdouble JNICALL Java_com_snobot_simulator_jni_module_1wrapper_AnalogOutWrapperJni_getVoltagee(
JNIEXPORT jdouble JNICALL Java_com_snobot_simulator_jni_module_1wrapper_AnalogOutWrapperJni_getVoltage(
JNIEnv * env, jclass, jint portHandle)
{
return SensorActuatorRegistry::Get().GetIAnalogOutWrapper(portHandle)->GetVoltage();
Expand Down
2 changes: 1 addition & 1 deletion snobot_sim_joysticks/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencies {
compile project(":snobot_sim_utilities")

// Test
testCompile 'org.junit.jupiter:junit-jupiter-api:5.5.1'
testCompile 'org.junit.jupiter:junit-jupiter-api:5.5.2'
testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.5.1'
testRuntime 'org.junit.platform:junit-platform-launcher:1.5.1'
testRuntime 'edu.wpi.first.ntcore:ntcore-jni:' + getNtCoreVersion() + ':all'
Expand Down
4 changes: 2 additions & 2 deletions snobot_sim_utilities/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ ext
apply from: "${rootDir}/common/base_java_script.gradle"

dependencies {
compile 'org.apache.logging.log4j:log4j-api:2.12.1'
compile 'org.apache.logging.log4j:log4j-api:2.12.0'
compile 'org.apache.logging.log4j:log4j-core:2.12.1'

testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1'
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.2'
}

jar {
Expand Down

0 comments on commit b0f3c49

Please sign in to comment.