@@ -88,9 +88,9 @@ configure<RdGenExtension> {
88
88
hashFolder = rdgenDir.toString()
89
89
90
90
classpath({
91
- val ijDependency = intellij.getIdeaDependency(project )
91
+ val ijDependency = tasks.setupDependencies.flatMap { it.idea }.map { it.classes }.get( )
92
92
println (" Calculating classpath for rdgen, intellij.ideaDependency is: $ijDependency " )
93
- File (ijDependency.classes , " lib/rd" ).resolve(" rider-model.jar" ).absolutePath
93
+ File (ijDependency, " lib/rd" ).resolve(" rider-model.jar" ).absolutePath
94
94
})
95
95
96
96
sources(projectDir.resolve(" protocol/model" ))
@@ -157,6 +157,8 @@ val prepareBuildProps = tasks.register("prepareBuildProps") {
157
157
val prepareNuGetConfig = tasks.register(" prepareNuGetConfig" ) {
158
158
group = backendGroup
159
159
160
+ dependsOn(tasks.setupDependencies)
161
+
160
162
val nugetConfigPath = File (projectDir, " NuGet.Config" )
161
163
// FIX_WHEN_MIN_IS_211 remove the projectDir one above
162
164
val nugetConfigPath211 = Path .of(projectDir.absolutePath, " testData" , " NuGet.config" ).toFile()
@@ -199,7 +201,7 @@ val buildReSharperPlugin = tasks.register("buildReSharperPlugin") {
199
201
}
200
202
201
203
fun getNugetPackagesPath (): File {
202
- val sdkPath = intellij.getIdeaDependency(project). classes
204
+ val sdkPath = tasks.setupDependencies.flatMap { it.idea }.map { it. classes }.get()
203
205
println (" SDK path: $sdkPath " )
204
206
205
207
val riderSdk = File (sdkPath, " lib/DotNetSdkForRdPlugins" )
0 commit comments