Skip to content

Commit

Permalink
Update Gradle and Gradle plugins
Browse files Browse the repository at this point in the history
  • Loading branch information
NeRdTheNed committed Nov 20, 2023
1 parent aaba49f commit f9fd97c
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
20 changes: 10 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ buildscript {
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
}
classpath 'org.parchmentmc:librarian:1.+'
classpath 'com.guardsquare:proguard-gradle:7.3.2'
classpath 'com.guardsquare:proguard-gradle:7.4.0'
}
}

plugins {
id 'java-library'
id 'maven-publish'
id 'net.ltgt.errorprone' version '3.1.0'
id 'com.github.spotbugs' version '5.1.3'
id 'com.github.spotbugs' version '5.2.3'
}

repositories {
Expand Down Expand Up @@ -119,20 +119,20 @@ dependencies {
proguardHack(fg.deobf("me.shedaniel.cloth:cloth-config-forge:${project.cloth_config_version}"))

// NullAway
annotationProcessor "com.uber.nullaway:nullaway:0.10.14"
annotationProcessor "com.uber.nullaway:nullaway:0.10.17"

// JetBrains null annotations
compileOnly "org.jetbrains:annotations:24.0.1"
//proguardHack "org.jetbrains:annotations:24.0.1"
compileOnly "org.jetbrains:annotations:24.1.0"
//proguardHack "org.jetbrains:annotations:24.1.0"

// SpotBugs annotations
compileOnly "com.github.spotbugs:spotbugs-annotations:4.7.3"
proguardHack "com.github.spotbugs:spotbugs-annotations:4.7.3"
compileOnly "com.github.spotbugs:spotbugs-annotations:4.8.1"
proguardHack "com.github.spotbugs:spotbugs-annotations:4.8.1"

// Error Prone
errorprone "com.google.errorprone:error_prone_core:2.22.0"
compileOnly "com.google.errorprone:error_prone_annotations:2.22.0"
proguardHack "com.google.errorprone:error_prone_annotations:2.22.0"
errorprone "com.google.errorprone:error_prone_core:2.23.0"
compileOnly "com.google.errorprone:error_prone_annotations:2.23.0"
proguardHack "com.google.errorprone:error_prone_annotations:2.23.0"
}

jar.finalizedBy('reobfJar')
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ pluginManagement {
}

plugins {
id "com.gradle.enterprise" version "3.15"
id "com.gradle.enterprise" version "3.15.1"
}

gradleEnterprise {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/iDiamondhunter/morebows/MoreBows.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ public final class MoreBows {

/** The loaded bow stats config settings. */
@SuppressWarnings("NullAway.Init")
@SuppressFBWarnings("MS_CANNOT_BE_FINAL")
@SuppressFBWarnings({ "MS_CANNOT_BE_FINAL", "PA_PUBLIC_PRIMITIVE_ATTRIBUTE" })
public static ConfigBows configBowsInst;

/** The loaded general config settings. */
@SuppressWarnings("NullAway.Init")
@SuppressFBWarnings("MS_CANNOT_BE_FINAL")
@SuppressFBWarnings({ "MS_CANNOT_BE_FINAL", "PA_PUBLIC_PRIMITIVE_ATTRIBUTE" })
public static ConfigGeneral configGeneralInst;

/*
Expand Down

0 comments on commit f9fd97c

Please sign in to comment.