Skip to content

Commit

Permalink
upgradle
Browse files Browse the repository at this point in the history
  • Loading branch information
KotlinIsland committed Feb 8, 2024
1 parent b02df51 commit 483a7b9
Show file tree
Hide file tree
Showing 7 changed files with 56 additions and 55 deletions.
39 changes: 24 additions & 15 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,35 +1,44 @@
fun properties(key: String) = providers.gradleProperty(key)
fun environment(key: String) = providers.environmentVariable(key)

plugins {
kotlin("jvm") version "1.9.0-Beta"
id("org.jetbrains.intellij") version "1.13.2"
kotlin("jvm") version "1.9.22"
id("org.jetbrains.intellij") version "1.17.1"
}

group = properties("pluginGroup").get()
version = properties("pluginVersion").get()

repositories {
mavenCentral()
}

kotlin {
jvmToolchain(17)
jvmToolchain {
languageVersion = JavaLanguageVersion.of(17)
@Suppress("UnstableApiUsage")
vendor = JvmVendorSpec.JETBRAINS
}
}

dependencies{
implementation("org.jetbrains:annotations:23.0.0")
}

val intellijVersion = System.getenv().getOrDefault("IDEA_VERSION", "PC-2023.1.2")

val pythonPluginForVersion = mapOf(
"PC-2023.1.2" to "python-ce",
"IC-2023.1" to "PythonCore:231.5744.248",
)

// Configure Gradle IntelliJ Plugin - read more: https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html
intellij {
version.set(intellijVersion)
plugins.set(listOf(pythonPluginForVersion[intellijVersion]))
pluginName = properties("pluginName")
version = properties("platformVersion")
type = properties("platformType")

// Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file.
plugins = properties("platformPlugins").map { it.split(',').map(String::trim).filter(String::isNotEmpty) }
}

java.sourceCompatibility = JavaVersion.VERSION_17

tasks.patchPluginXml {
sinceBuild.set("222")
untilBuild.set("999.*")
tasks {
wrapper {
gradleVersion = properties("gradleVersion").get()
}
}
21 changes: 9 additions & 12 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
# IntelliJ Platform Artifacts Repositories -> https://plugins.jetbrains.com/docs/intellij/intellij-artifacts.html

pluginGroup = com.github.kotlinisland.inspectionsforlinters
pluginName = inspections-for-linters
pluginRepositoryUrl = https://github.com/KotlinIsland/inspections-for-linters
pluginGroup = com.millennialmedia.intellibot@kotlinisland
pluginName = IntelliBased
pluginRepositoryUrl = https://github.com/KotlinIsland/Intellibot
# SemVer format -> https://semver.org
pluginVersion = 0.0.1-SNAPSHOT
pluginVersion = 1.15.191.8027

# Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
pluginSinceBuild = 231
pluginUntilBuild = 232.*
pluginSinceBuild = 222
pluginUntilBuild = 999.*

# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
platformType = IC
platformVersion = 2023.1.2
platformVersion = 2023.3.3

# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
platformPlugins = PythonCore:231.8770.65
platformPlugins = pythonid:233.13135.103

# Gradle Releases -> https://github.com/gradle/gradle/releases
gradleVersion = 8.2-rc-2
gradleVersion = 8.6

# Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib
kotlin.stdlib.default.dependency = false
Expand All @@ -29,6 +29,3 @@ org.gradle.configuration-cache = true

# Enable Gradle Build Cache -> https://docs.gradle.org/current/userguide/build_cache.html
org.gradle.caching = true

# Temporary workaround for Kotlin Compiler OutOfMemoryError -> https://jb.gg/intellij-platform-kotlin-oom
kotlin.incremental.useClasspathSnapshot = false
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
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-8.2-rc-2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
17 changes: 9 additions & 8 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -144,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -201,11 +202,11 @@ fi
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.
# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
Expand Down
20 changes: 10 additions & 10 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand All @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand Down
12 changes: 3 additions & 9 deletions src/main/resources/META-INF/plugin.xml
Original file line number Diff line number Diff line change
@@ -1,21 +1,15 @@
<idea-plugin>
<id>com.millennialmedia.intellibot@kotlinisland</id>
<name>IntelliBot #based</name>
<name>IntelliBased</name>
<version>1.15.191.8026</version>
<vendor url="https://plugins.jetbrains.com/plugin/17424-intellibot-patched">Millennial Media</vendor>

<depends>com.intellij.modules.lang</depends>
<depends optional="true">com.intellij.modules.python</depends>
<!-- Ultimate -->
<!--suppress PluginXmlValidity -->
<depends optional="true">Pythonid</depends>
<!-- Community Edition -->
<!--suppress PluginXmlValidity -->
<depends optional="true">PythonCore</depends>

<description><![CDATA[
<h1>IntelliBot, Robot Framework Support</h1>
<p>The IntelliBot plugin for IntelliJ/Pycharm adds smart editing features to support the <a href="http://robotframework.org/">Robot Framework</a>.</p>
<h1>IntelliBased, Robot Framework Support</h1>
<p>The IntelliBased plugin for IntelliJ/Pycharm adds smart editing features to support the <a href="http://robotframework.org/">Robot Framework</a>.</p>
<p>Find more details at <a href="https://plugins.jetbrains.com/plugin/17424-intellibot-patched">Marketplace</a> or <a href="https://github.com/lte2000/intellibot">Github</a>.</p>
<br>
<p>Make sure to <a href="https://github.com/mtrubs/intellibot/wiki/Python-Interpreter">setup your IDE correctly</a> to gain Python support.</p>
Expand Down

0 comments on commit 483a7b9

Please sign in to comment.