Merge pull request #156 from robohorse/project_update

Gradle script update
robohorse · Sep 4, 2024 · ce98ae2 · ce98ae2
2 parents ce486d1 + 8695d89
commit ce98ae2
Show file tree

Hide file tree

Showing 7 changed files with 71 additions and 39 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 2.5.1
+- Minor improvements with dependencies update.
+
 ## 2.5.0
 - Latest IDE support
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,27 +2,26 @@ plugins {
     id("java")
     id("maven-publish")
     alias(libs.plugins.kotlin.jvm) apply false
-    alias(libs.plugins.jetbrains.intellij)
+    alias(libs.plugins.jetbrains.intellij.platform) apply true
+    alias(libs.plugins.jetbrains.intellij.module) apply false
     alias(libs.plugins.ktlint)
-    alias(libs.plugins.jetbrains.changelog) apply false
 }
 
 repositories {
     mavenCentral()
-}
-
-subprojects {
-    apply(plugin = "java")
-
-    repositories {
-        mavenCentral()
+    intellijPlatform {
+        defaultRepositories()
     }
+}
 
-    dependencies {
-        implementation(rootProject.libs.kotlin.stdlib)
-        implementation(rootProject.libs.insert.koin)
+dependencies {
+    intellijPlatform {
+        intellijIdeaCommunity(rootProject.libs.versions.ide)
+        pluginModule(implementation(project(":main")))
+        bundledPlugin("com.intellij.java")
 
-        testImplementation(rootProject.libs.kotlin.test)
-        testImplementation(rootProject.libs.io.mockk)
+        pluginVerifier()
+        zipSigner()
+        instrumentationTools()
     }
 }
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -2,4 +2,24 @@ plugins {
     id("java")
     id("maven-publish")
     alias(libs.plugins.kotlin.jvm) apply true
+    alias(libs.plugins.jetbrains.intellij.module)
+}
+
+repositories {
+    mavenCentral()
+    intellijPlatform {
+        defaultRepositories()
+    }
+}
+
+dependencies {
+    intellijPlatform {
+        intellijIdeaCommunity(rootProject.libs.versions.ide)
+        instrumentationTools()
+    }
+    implementation(rootProject.libs.kotlin.stdlib)
+    implementation(rootProject.libs.insert.koin)
+
+    testImplementation(rootProject.libs.kotlin.test)
+    testImplementation(rootProject.libs.io.mockk)
 }
diff --git a/generator/build.gradle.kts b/generator/build.gradle.kts
@@ -2,11 +2,28 @@ plugins {
     id("java")
     id("maven-publish")
     alias(libs.plugins.kotlin.jvm) apply true
+    alias(libs.plugins.jetbrains.intellij.module) apply true
+}
+
+repositories {
+    mavenCentral()
+    intellijPlatform {
+        defaultRepositories()
+    }
 }
 
 dependencies {
+    intellijPlatform {
+        intellijIdeaCommunity(rootProject.libs.versions.ide)
+        instrumentationTools()
+    }
     implementation(project(":core", "default"))
     implementation(rootProject.libs.org.json)
     implementation(rootProject.libs.commons.io)
     implementation(rootProject.libs.google.guava)
+    implementation(rootProject.libs.kotlin.stdlib)
+    implementation(rootProject.libs.insert.koin)
+
+    testImplementation(rootProject.libs.kotlin.test)
+    testImplementation(rootProject.libs.io.mockk)
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,23 +5,24 @@ kotlin = "1.8.0"
 intellij = "2.0.1"
 ktlint = "10.2.0"
 rsyntaxtextarea = "3.4.0"
-changelog = "1.3.1"
 json = "20231013"
 commons = "2.11.0"
 guava = "33.1.0-jre"
+ide = "2024.1.2"
 
 [libraries]
 insert-koin = { group = "io.insert-koin", name = "koin-core", version.ref = "koin" }
 io-mockk = { group = "io.mockk", name = "mockk", version.ref = "mockk" }
 kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit", version.ref = "kotlin" }
 kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" }
 fifesoft-rsyntaxtextarea = { group = "com.fifesoft", name = "rsyntaxtextarea", version.ref = "rsyntaxtextarea" }
-org-json={ group = "org.json", name = "json", version.ref = "json" }
-commons-io={ group = "commons-io", name = "commons-io", version.ref = "commons" }
-google-guava ={ group = "com.google.guava", name = "guava", version.ref = "guava" }
+org-json = { group = "org.json", name = "json", version.ref = "json" }
+commons-io = { group = "commons-io", name = "commons-io", version.ref = "commons" }
+google-guava = { group = "com.google.guava", name = "guava", version.ref = "guava" }
 
 [plugins]
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
-jetbrains-intellij = { id = "org.jetbrains.intellij.platform", version.ref = "intellij" }
+jetbrains-intellij-platform = { id = "org.jetbrains.intellij.platform", version.ref = "intellij" }
+jetbrains-intellij-module = { id = "org.jetbrains.intellij.platform.module", version.ref = "intellij" }
 ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" }
-jetbrains-changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" }
+
diff --git a/main/build.gradle.kts b/main/build.gradle.kts
@@ -2,8 +2,7 @@ plugins {
     id("java")
     id("maven-publish")
     alias(libs.plugins.kotlin.jvm) apply true
-    alias(libs.plugins.jetbrains.changelog) apply true
-    alias(libs.plugins.jetbrains.intellij)
+    alias(libs.plugins.jetbrains.intellij.module) apply true
 }
 
 repositories {
@@ -15,28 +14,16 @@ repositories {
 
 dependencies {
     intellijPlatform {
-        intellijIdeaCommunity("2024.1.2")
-        bundledPlugin("com.intellij.java")
-
-        pluginVerifier()
-        zipSigner()
+        intellijIdeaCommunity(rootProject.libs.versions.ide)
         instrumentationTools()
     }
     implementation(project(":generator", "default"))
     implementation(project(":core", "default"))
 
     implementation(rootProject.libs.fifesoft.rsyntaxtextarea)
-}
+    implementation(rootProject.libs.kotlin.stdlib)
+    implementation(rootProject.libs.insert.koin)
 
-intellijPlatform {
-    pluginConfiguration {
-        id = "com.robohorse.robopojogenerator"
-        name = "RoboPOJOGenerator"
-        version = "2.5.0"
-        changeNotes = "Latest IDE support"
-        ideaVersion {
-            sinceBuild = "241"
-            untilBuild = "242.*"
-        }
-    }
+    testImplementation(rootProject.libs.kotlin.test)
+    testImplementation(rootProject.libs.io.mockk)
 }
diff --git a/main/src/main/resources/META-INF/plugin.xml b/main/src/main/resources/META-INF/plugin.xml
@@ -1,4 +1,9 @@
 <idea-plugin>
+    <id>com.robohorse.robopojogenerator</id>
+    <name>RoboPOJOGenerator</name>
+    <version>2.5.1</version>
+    <idea-version since-build="241" until-build="242.*"/>
+    <change-notes>Minor improvements with dependencies update</change-notes>
     <vendor email="robohorsed@gmail.com" url="https://github.com/robohorse/RoboPOJOGenerator">ROBOHORSE</vendor>
     <extensions defaultExtensionNs="com.intellij">
         <applicationService serviceImplementation="com.robohorse.robopojogenerator.persistense.ViewStateService"/>