Skip to content

Commit

Permalink
Fix missing tests (#277)
Browse files Browse the repository at this point in the history
Test fixes, deprecated logic regarding legacy Xray configurations was removed, and IntelliJ Plugin SDK was upgraded.
  • Loading branch information
asafgabai authored Jan 22, 2023
1 parent 77089b0 commit 6e61bd3
Show file tree
Hide file tree
Showing 21 changed files with 235 additions and 560 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/frogbot-scan-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Setup Gradle
uses: gradle/gradle-build-action@v2
with:
gradle-version: 6.9.3
gradle-version: 7.4.1

- uses: jfrog/frogbot@v2
env:
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,14 @@ jobs:

# Install required tools
- name: Set up Java
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
distribution: 'adopt'
java-version: '11'
- name: Setup Gradle
uses: gradle/gradle-build-action@v2
with:
gradle-version: 7.4.1
- name: Setup NodeJS
uses: actions/setup-node@v2
with:
Expand Down
10 changes: 6 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import java.net.http.*
import java.nio.file.Paths

plugins {
id "org.jetbrains.intellij" version "1.10.0-SNAPSHOT"
id "org.jetbrains.intellij" version "1.12.0"
id "java"
id "maven-publish"
id "de.undercouch.download" version "5.3.0"
Expand All @@ -11,12 +11,12 @@ plugins {
group 'com.jfrog.ide'
version currentVersion

sourceCompatibility = 1.11
targetCompatibility = 1.11
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11

intellij {
version = sandboxVersion
plugins = ['gradle', 'maven', 'Groovy', 'properties', 'java', 'Kotlin', 'org.jetbrains.plugins.go:213.5744.18', 'Pythonid:213.5744.18']
plugins = ['gradle', 'maven', 'Groovy', 'properties', 'java', 'Kotlin', 'org.jetbrains.plugins.go:213.5744.223', 'Pythonid:213.5744.223']
pluginName = 'JFrog'
updateSinceUntilBuild = false
}
Expand Down Expand Up @@ -59,6 +59,8 @@ dependencies {
}

test {
scanForTestClasses false
include "**/*Test.class"
testLogging {
exceptionFormat "full"
events "started", "passed", "skipped", "failed", "standardOut", "standardError"
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 6e61bd3

Please sign in to comment.