Skip to content

Commit

Permalink
Version 1.2.6: fix urgent issues, deprecated APIs, update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
amaembo committed Dec 21, 2023
1 parent aeba275 commit a562448
Show file tree
Hide file tree
Showing 31 changed files with 306 additions and 558 deletions.
2 changes: 1 addition & 1 deletion .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 17 additions & 18 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,31 +20,30 @@
*/

plugins {
id "org.jetbrains.intellij" version "0.4.21"
id "org.jetbrains.intellij" version "1.16.1"
id 'jacoco'
}

apply plugin: 'org.jetbrains.intellij'
apply plugin: 'maven-publish'
apply plugin: 'java'

sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = 11
targetCompatibility = 11

repositories {
mavenLocal()
mavenCentral()
}

intellij {
version ijVersion
version = ijVersion

pluginName 'spotbugs-idea'
updateSinceUntilBuild false
type 'IC'
pluginName = 'spotbugs-idea'
updateSinceUntilBuild = false
type = 'IC'

plugins 'git4idea'
plugins 'java'
plugins = ['git4idea', 'java']
}

jacoco {
Expand All @@ -61,42 +60,42 @@ configurations {
}

dependencies {
implementation ('com.github.spotbugs:spotbugs:4.4.2') {
implementation ('com.github.spotbugs:spotbugs:4.7.3') {
exclude group: 'xml-apis', module: 'xml-apis'
}
implementation 'net.sf.saxon:Saxon-HE:9.9.1-2'
implementation 'org.jsoup:jsoup:1.8.3'
implementation 'net.sf.saxon:Saxon-HE:12.3'
implementation 'org.jsoup:jsoup:1.16.1'
implementation 'info.clearthought:table-layout:4.3.0'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.assertj:assertj-core:3.21.0'
testImplementation 'org.mockito:mockito-core:4.0.0'
thirdPartyPlugins 'com.mebigfatguy.fb-contrib:fb-contrib:7.4.7'
thirdPartyPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.11.0'
thirdPartyPlugins 'com.mebigfatguy.fb-contrib:fb-contrib:7.6.0'
thirdPartyPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.12.0'
fbContribJava6 'com.mebigfatguy.fb-contrib:fb-contrib:6.2.1'
}

task copyGradleProperties(type: Copy) {
tasks.register('copyGradleProperties', Copy) {
description 'Copy gradle.properties to project resources.'
from 'gradle.properties'
into 'build/resources/main/org/jetbrains/plugins/spotbugs/common'
rename { _ -> 'version.properties' }
}

task downloadThirdPartyPlugins(type: Copy) {
tasks.register('downloadThirdPartyPlugins', Copy) {
description 'Downloads third-party plugins Find Security Bugs and FB-Contrib.'
from configurations.thirdPartyPlugins
from configurations.fbContribJava6
into 'build/resources/main/org/jetbrains/plugins/spotbugs/plugins'
}

task copyThirdPartyPlugins(type: Copy) {
tasks.register('copyThirdPartyPlugins', Copy) {
dependsOn(downloadThirdPartyPlugins, prepareSandbox)
description 'Copy plugins into sandbox.'
from 'build/resources/main/org/jetbrains/plugins/spotbugs/plugins'
into 'build/idea-sandbox/plugins/spotbugs-idea/customPlugins'
}

task deleteThirdPartyPlugins(type: Delete) {
tasks.register('deleteThirdPartyPlugins', Delete) {
delete 'build/resources/main/org/jetbrains/plugins/spotbugs/plugins'
}

Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
# If not, see <http://www.gnu.org/licenses/>.
#

version=1.2.4
ijVersion=2019.3
version=1.2.6
ijVersion=2022.2

#---------------------------------------------------------------------
# The absolute path to the intellij-community source on your local machine.
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
22 changes: 1 addition & 21 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,25 +1,5 @@
#
# Copyright 2020 SpotBugs plugin contributors
#
# This file is part of IntelliJ SpotBugs plugin.
#
# IntelliJ SpotBugs plugin is free software: you can redistribute it
# and/or modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation, either version 3 of
# the License, or (at your option) any later version.
#
# IntelliJ SpotBugs plugin is distributed in the hope that it will
# be useful, but WITHOUT ANY WARRANTY; without even the implied
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with IntelliJ SpotBugs plugin.
# If not, see <http://www.gnu.org/licenses/>.
#

distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit a562448

Please sign in to comment.