Skip to content

Commit 30cf3ba

Browse files
authored
Update project dependencies (#98)
* Fix spotless under Nix * Bump logging deps * Bump healthcheck deps * Bump testing deps * Bump Kotlin * Bump json codegen * Bump spotless gradle * Spotless
1 parent d41edce commit 30cf3ba

File tree

3 files changed

+71
-19
lines changed

3 files changed

+71
-19
lines changed

build.gradle

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ plugins {
44
id "java"
55
id "idea"
66
id "maven-publish"
7-
id "org.jetbrains.kotlin.jvm" version "1.6.20"
8-
id "org.jetbrains.kotlin.kapt" version "1.6.20"
7+
id "org.jetbrains.kotlin.jvm" version "1.7.20"
8+
id "com.google.devtools.ksp" version "1.7.20-1.0.8"
99
id "edu.wpi.first.GradleRIO" version "2022.4.1"
10-
id 'com.diffplug.spotless' version '6.2.0'
10+
id "com.diffplug.spotless" version "6.11.0"
1111
}
1212

1313
group = "org.strykeforce"
@@ -69,20 +69,22 @@ dependencies {
6969

7070
testImplementation wpi.java.deps.wpilibJniDebug(wpi.platforms.desktop)
7171

72-
implementation 'org.slf4j:slf4j-api:1.7.36'
73-
implementation 'io.github.microutils:kotlin-logging:2.1.21'
74-
implementation 'com.squareup.okhttp3:okhttp:4.9.3'
75-
implementation "org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.3"
76-
implementation 'com.squareup.moshi:moshi:1.13.0'
77-
kapt 'com.squareup.moshi:moshi-kotlin-codegen:1.13.0'
72+
implementation('org.slf4j:slf4j-api:2.0.3')
73+
implementation('io.github.microutils:kotlin-logging:3.0.4')
74+
implementation('com.squareup.okhttp3:okhttp:4.10.0')
75+
implementation('org.jetbrains.kotlinx:kotlinx-html-jvm:0.8.0')
76+
implementation('com.squareup.moshi:moshi:1.14.0')
77+
ksp('com.squareup.moshi:moshi-kotlin-codegen:1.14.0')
7878

7979
// Testing
80-
testImplementation platform("org.junit:junit-bom:5.7.1")
81-
testImplementation "org.junit.jupiter:junit-jupiter"
82-
testImplementation 'org.assertj:assertj-core:3.22.0'
83-
testImplementation 'org.mockito:mockito-junit-jupiter:4.3.1'
84-
testImplementation 'org.skyscreamer:jsonassert:1.5.0'
85-
testRuntimeOnly 'ch.qos.logback:logback-classic:1.2.11'
80+
81+
testImplementation platform('org.junit:junit-bom:5.9.0')
82+
testImplementation("org.junit.jupiter:junit-jupiter")
83+
testImplementation('org.assertj:assertj-core:3.23.1')
84+
testImplementation('org.mockito:mockito-junit-jupiter:4.8.0')
85+
testImplementation("org.mockito.kotlin:mockito-kotlin:4.0.0")
86+
testImplementation('org.skyscreamer:jsonassert:1.5.1')
87+
testRuntimeOnly('ch.qos.logback:logback-classic:1.4.4')
8688

8789
api 'org.jetbrains:annotations:23.0.0'
8890
}
@@ -142,9 +144,9 @@ publishing {
142144

143145
spotless {
144146
java {
145-
target fileTree('.') {
147+
target fileTree('src') {
146148
include '**/*.java'
147-
exclude '**/build/**', '**/build-*/**'
149+
exclude '**/build/', '**/build-*/'
148150
}
149151
toggleOffOn()
150152
googleJavaFormat()
@@ -155,7 +157,7 @@ spotless {
155157
groovyGradle {
156158
target fileTree('.') {
157159
include '**/*.gradle'
158-
exclude '**/build/**', '**/build-*/**'
160+
exclude '**/build/', '**/build-*/'
159161
}
160162
greclipse()
161163
indentWithSpaces(4)
@@ -165,7 +167,7 @@ spotless {
165167
format 'misc', {
166168
target fileTree('.') {
167169
include '**/*.md', '**/.gitignore'
168-
exclude '**/build/**', '**/build-*/**'
170+
exclude '**/build/', '**/build-*/', '**/.direnv/'
169171
}
170172
trimTrailingWhitespace()
171173
indentWithSpaces(2)

flake.lock

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
description = "Dev shell for robot";
3+
4+
inputs =
5+
{
6+
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
7+
};
8+
9+
outputs = { self, nixpkgs }:
10+
let
11+
pkgs = nixpkgs.legacyPackages.aarch64-darwin;
12+
pkgs-x86 = nixpkgs.legacyPackages.x86_64-darwin;
13+
in
14+
{
15+
16+
devShells.aarch64-darwin.default = pkgs.mkShell {
17+
nativeBuildInputs = with pkgs-x86; [
18+
jdk11_headless
19+
];
20+
};
21+
22+
};
23+
}

0 commit comments

Comments
 (0)