Skip to content

Commit 2b00c15

Browse files
lourwlourw
committed
chore(gradle): ignore paths
1 parent 5efca28 commit 2b00c15

File tree

8 files changed

+90
-69
lines changed

8 files changed

+90
-69
lines changed

‎.nx/workflows/agents.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ common-init-steps: &common-init-steps
2727
- group-name: Install Dependencies
2828
parallel: true
2929
steps:
30-
- name: Install Gradle Dependencies
31-
script: ./gradlew dependencies
3230
- name: Install Node Modules
3331
uses: 'nrwl/nx-cloud-workflows/v4/workflow-steps/install-node-modules/main.yaml'
34-
- name: Install Browsers (if needed)
35-
uses: 'nrwl/nx-cloud-workflows/v4/workflow-steps/install-browsers/main.yaml'
36-
- name: Project graph
37-
script: ./gradlew nxProjectReport --info
32+
- name: Gradle nxProjectGraph
33+
script: npx nx show projects
34+
- name: Check workspace data cache
35+
script: ls -a .nx/workspace-data
36+
- name: Install Browsers
37+
uses: 'nrwl/nx-cloud-workflows/v4/workflow-steps/install-browsers/main.yaml'
3838

3939
launch-templates:
4040
linux-medium-plus-js:

‎apps/intellij/build.gradle.kts‎

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -12,33 +12,17 @@ val nxlsRoot = "${rootDir}/dist/apps/nxls"
1212
layout.buildDirectory = file("${rootDir}/dist/apps/intellij")
1313

1414
plugins {
15-
// Java support
1615
id("java")
17-
// Kotlin support
18-
id("org.jetbrains.kotlin.jvm") version "2.2.0"
19-
// Kotlin serialization
20-
id("org.jetbrains.kotlin.plugin.serialization") version "2.2.0"
21-
// Gradle IntelliJ Platform Plugin
22-
id("org.jetbrains.intellij.platform") version "2.9.0"
23-
24-
// Gradle Changelog Plugin
2516
id("org.jetbrains.changelog") version "2.4.0"
26-
27-
id("com.ncorti.ktfmt.gradle") version "0.24.0"
28-
id("dev.nx.gradle.project-graph") version "0.1.8"
17+
id("org.jetbrains.intellij.platform") version "2.9.0"
2918
}
3019

3120
group = providers.gradleProperty("pluginGroup").get()
32-
version = providers.gradleProperty("version").get()
3321

22+
version = providers.gradleProperty("version").get()
3423

3524
// Configure project's dependencies
36-
repositories {
37-
mavenLocal()
38-
mavenCentral()
39-
gradlePluginPortal()
40-
intellijPlatform { defaultRepositories() }
41-
}
25+
repositories { intellijPlatform { defaultRepositories() } }
4226

4327
configurations.all {
4428
exclude("org.slf4j", "slf4j-api")
@@ -64,13 +48,11 @@ dependencies {
6448
testImplementation("junit:junit:4.13.2")
6549

6650
intellijPlatform {
67-
val type = providers.gradleProperty("platformType")
68-
val version = providers.gradleProperty("platformVersion")
69-
create(type, version) {
70-
useCache = true
71-
}
51+
val type = providers.gradleProperty("platformType")
52+
val version = providers.gradleProperty("platformVersion")
53+
create(type, version) { useCache = true }
7254

73-
plugin("com.intellij.ml.llm:252.25557.171")
55+
plugin("com.intellij.ml.llm:252.25557.171")
7456
bundledPlugins(
7557
providers.gradleProperty("platformPlugins").map { plugins ->
7658
plugins.split(',').map(String::trim).filter(String::isNotEmpty)

‎apps/intellij/project.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@
33
"$schema": "../../node_modules/nx/schemas/project-schema.json",
44
"projectType": "application",
55
"targets": {
6+
"prepareTest": {
7+
"inputs": ["!{workspaceRoot}/.intellijPlatform"]
8+
},
9+
"buildSearchableOptions": {
10+
"inputs": ["!{workspaceRoot}/.intellijPlatform"]
11+
},
12+
"runIde": {
13+
"inputs": ["!{workspaceRoot}/.intellijPlatform"]
14+
},
15+
"testIdePerformance": {
16+
"inputs": ["!{workspaceRoot}/.intellijPlatform"]
17+
},
618
"initializeIntellijPlatformPlugin": {
719
"inputs": ["!{workspaceRoot}/.intellijPlatform"]
820
},

‎apps/intellij/settings.gradle.kts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
rootProject.name = "intellij-app"
22

3-
include("libs:intellij:models")
4-
project(":libs:intellij:models").projectDir = file("../../libs/intellij/models")
3+
include("intellij-models")
4+
5+
project(":intellij-models").projectDir = file("../../libs/intellij/models")

‎build.gradle.kts‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,31 @@ group = "dev.nx.console"
33
layout.buildDirectory = File("dist")
44

55
plugins {
6-
id("dev.nx.gradle.project-graph") version "0.1.8"
7-
id("com.ncorti.ktfmt.gradle") version "0.11.0"
6+
id("dev.nx.gradle.project-graph") version "0.1.8"
7+
id("com.ncorti.ktfmt.gradle") version "0.24.0"
88

9-
// Java support
10-
id("java")
11-
// Kotlin support
12-
id("org.jetbrains.kotlin.jvm") version "2.0.21"
13-
// Kotlin serialization
14-
id("org.jetbrains.kotlin.plugin.serialization") version "2.0.21"
15-
id("org.jetbrains.intellij.platform") version "2.9.0"
9+
id("org.jetbrains.kotlin.jvm") version "2.2.0"
10+
id("org.jetbrains.kotlin.plugin.serialization") version "2.2.0"
1611
}
1712

1813
allprojects {
19-
apply {
20-
plugin("dev.nx.gradle.project-graph")
21-
plugin("com.ncorti.ktfmt.gradle")
22-
plugin("org.jetbrains.kotlin.jvm")
23-
plugin("org.jetbrains.intellij.platform")
24-
}
14+
repositories {
15+
mavenLocal()
16+
mavenCentral()
17+
gradlePluginPortal()
18+
}
19+
20+
apply {
21+
plugin("dev.nx.gradle.project-graph")
22+
plugin("com.ncorti.ktfmt.gradle")
23+
plugin("org.jetbrains.kotlin.jvm")
24+
plugin("org.jetbrains.kotlin.plugin.serialization")
25+
}
2526
}
2627

2728
tasks {
28-
register<DefaultTask>("publish") {
29-
group = "publish"
30-
description = "Placeholder task to workaround the semantic-release plugin"
31-
}
29+
register<DefaultTask>("publish") {
30+
group = "publish"
31+
description = "Placeholder task to workaround the semantic-release plugin"
32+
}
3233
}

‎libs/intellij/models/build.gradle.kts‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,26 @@
11
plugins {
2-
// Java support
32
id("java-library")
4-
// Kotlin serialization
5-
id("org.jetbrains.kotlin.plugin.serialization") version "2.2.0"
6-
// Gradle IntelliJ Platform Plugin
7-
id("org.jetbrains.intellij.platform.module")
3+
id("org.jetbrains.intellij.platform") version "2.9.0"
84
}
95

106
group = providers.gradleProperty("pluginGroup").get()
117

128
version = providers.gradleProperty("version").get()
139

1410
// Configure project's dependencies
15-
repositories {
16-
mavenLocal()
17-
mavenCentral()
18-
gradlePluginPortal()
19-
intellijPlatform { defaultRepositories() }
20-
}
11+
repositories { intellijPlatform { defaultRepositories() } }
2112

2213
dependencies {
2314
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0")
2415
implementation("com.google.code.gson:gson:2.10.1")
2516

2617
intellijPlatform {
27-
val type = providers.gradleProperty("platformType")
28-
val version = providers.gradleProperty("platformVersion")
29-
create(type, version) {
30-
useCache = true
31-
}
18+
val type = providers.gradleProperty("platformType")
19+
val version = providers.gradleProperty("platformVersion")
20+
create(type, version) { useCache = true }
3221
}
3322
}
3423

3524
ktfmt { kotlinLangStyle() }
25+
3626
kotlin { jvmToolchain(21) }

‎libs/intellij/models/project.json‎

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,38 @@
22
"name": "models",
33
"$schema": "../../node_modules/nx/schemas/project-schema.json",
44
"projectType": "library",
5-
"tags": ["type:intellij"]
5+
"tags": ["type:intellij"],
6+
"targets": {
7+
"prepareTest": {
8+
"inputs": ["!{workspaceRoot}/.intellijPlatform"]
9+
},
10+
"buildSearchableOptions": {
11+
"inputs": ["!{workspaceRoot}/.intellijPlatform"]
12+
},
13+
"runInspections": {
14+
"inputs": ["!{projectRoot}/.intellijPlatform"]
15+
},
16+
"runIde": {
17+
"inputs": ["!{workspaceRoot}/.intellijPlatform"]
18+
},
19+
"testIdePerformance": {
20+
"inputs": ["!{workspaceRoot}/.intellijPlatform"]
21+
},
22+
"verifyPlugin": {
23+
"inputs": ["!{workspaceRoot}/.intellijPlatform"],
24+
"cache": true
25+
},
26+
"compileJava": {
27+
"inputs": ["!{workspaceRoot}/.intellijPlatform"]
28+
},
29+
"compileTestJava": {
30+
"inputs": ["!{workspaceRoot}/.intellijPlatform"]
31+
},
32+
"verifyPluginProjectConfiguration": {
33+
"inputs": ["!{workspaceRoot}/.intellijPlatform"]
34+
},
35+
"javadoc": {
36+
"inputs": ["!{workspaceRoot}/.intellijPlatform"]
37+
}
38+
}
639
}

‎settings.gradle.kts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ rootProject.name = "nx-console"
33
plugins { id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0" }
44

55
include("intellij-models")
6+
67
project(":intellij-models").projectDir = file("libs/intellij/models")
78

89
include("intellij")
10+
911
project(":intellij").projectDir = file("apps/intellij")

0 commit comments

Comments
 (0)