Skip to content

Commit

Permalink
Upgrading IntelliJ to 2022.2
Browse files Browse the repository at this point in the history
  • Loading branch information
ChrisCarini committed Jul 29, 2022
1 parent 89f13c8 commit 4815ae3
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 28 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/compatibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ jobs:
uses: ChrisCarini/intellij-platform-plugin-verifier-action@latest
with:
ide-versions: |
ideaIC:2022.1
ideaIU:2022.1
ideaIC:2022.2
ideaIU:2022.2
ideaIC:LATEST-EAP-SNAPSHOT
ideaIU:LATEST-EAP-SNAPSHOT
Expand Down
15 changes: 8 additions & 7 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
### Added

### Changed
- Upgrading IntelliJ to 2022.2

### Deprecated

Expand All @@ -16,15 +17,15 @@
### Security

## [2.6.0] - 2022-04-24
### Added
- Changing connection settings will begin shipping logs without needing an IDE restart.
- Plugin Icon <img src="https://raw.githubusercontent.com/ChrisCarini/logshipper-intellij-plugin/master/icon/pluginIcon.svg" width="24" />
### Added
- Changing connection settings will begin shipping logs without needing an IDE restart.
- Plugin Icon <img src="https://raw.githubusercontent.com/ChrisCarini/logshipper-intellij-plugin/master/icon/pluginIcon.svg" width="24" />

### Changed
- Upgrading IntelliJ to 2022.1
- Upgrading demo ELK cluster to 8.0.0
### Changed
- Upgrading IntelliJ to 2022.1
- Upgrading demo ELK cluster to 8.0.0

### Removed
### Removed
- Removing log4j dependency / reliance to align with [the IntelliJ Platform change](https://blog.jetbrains.com/platform/2022/02/removing-log4j-from-the-intellij-platform/).

## [2.5.2] - 2021-12-01
Expand Down
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
pluginGroup = com.chriscarini.jetbrains
pluginName = 'Logshipper'
# SemVer format -> https://semver.org
pluginVersion = 2.6.0
pluginVersion = 2.7.0

### I DO NOT MAKE USE OF SINCE/UNTIL IN THIS PLUGIN.
## See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
Expand All @@ -14,15 +14,15 @@ pluginVersion = 2.6.0

# Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
# See https://jb.gg/intellij-platform-builds-list for available build versions
pluginVerifierIdeVersions = 2022.1
pluginVerifierIdeVersions = 2022.2

# IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
platformType = IC
# see https://www.jetbrains.com/intellij-repository/releases/
# and https://www.jetbrains.com/intellij-repository/snapshots/
# To use/download EAP add '-EAP-SNAPSHOT' to the version, i.e. 'IU-191.6014.8-EAP-SNAPSHOT'
# platformVersion = '201.6668.60-EAP-SNAPSHOT'
platformVersion = 2022.1
platformVersion = 2022.2
platformDownloadSources = true

# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
Expand All @@ -33,7 +33,7 @@ platformPlugins =
javaVersion = 11

# Gradle Releases -> https://github.com/gradle/gradle/releases
gradleVersion=7.4.2
gradleVersion=7.5

##
# ----- NON JETBRAINS PLUGIN SETTINGS -----
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
1 change: 0 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=cb87f222c5585bd46838ad4db78463a5c5f3d336e5e2b98dc7c0c586527351c2
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 0 additions & 6 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -205,12 +205,6 @@ set -- \
org.gradle.wrapper.GradleWrapperMain \
"$@"

# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi

# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
Expand Down
14 changes: 6 additions & 8 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
@rem limitations under the License.
@rem

@if "%DEBUG%"=="" @echo off
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
Expand All @@ -25,7 +25,7 @@
if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

Expand All @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute
if "%ERRORLEVEL%" == "0" goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Expand Down Expand Up @@ -75,15 +75,13 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

:end
@rem End local scope for the variables with windows NT shell
if %ERRORLEVEL% equ 0 goto mainEnd
if "%ERRORLEVEL%"=="0" goto mainEnd

:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1

:mainEnd
if "%OS%"=="Windows_NT" endlocal
Expand Down

0 comments on commit 4815ae3

Please sign in to comment.