Skip to content

Commit 64ece11

Browse files
committed
upgrade to beta8
1 parent 3058640 commit 64ece11

File tree

7 files changed

+2
-102
lines changed

7 files changed

+2
-102
lines changed

build.gradle.kts

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import org.jetbrains.changelog.date
99
import org.jetbrains.changelog.exceptions.MissingVersionException
1010
import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
1111
import org.jetbrains.intellij.platform.gradle.models.ProductRelease
12-
import org.jetbrains.intellij.platform.gradle.tasks.CustomRunIdeTask
1312
import org.jetbrains.intellij.platform.gradle.tasks.VerifyPluginTask
1413

1514
fun properties(key: String) = properties(key, project)
@@ -285,22 +284,6 @@ tasks {
285284
}
286285
}
287286

288-
// todo: create custom tasks, for example: runWithoutKotlin, runWithoutGradle etc
289-
// see:https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-custom-tasks.html
290-
291-
292-
val runWithoutGitHubPlugin by registering(CustomRunIdeTask::class) {
293-
plugins {
294-
disablePlugin("org.jetbrains.plugins.github")
295-
}
296-
}
297-
298-
val runWithoutKotlinPlugin by registering(CustomRunIdeTask::class) {
299-
plugins {
300-
disablePlugin("org.jetbrains.kotlin")
301-
}
302-
}
303-
304287

305288
runIde {
306289
dependsOn(deleteLog)

building-how-to/building-with-eap.txt

Lines changed: 0 additions & 54 deletions
This file was deleted.

common-build-logic/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ repositories {
1111
}
1212

1313
dependencies {
14-
implementation("org.jetbrains.intellij.platform:intellij-platform-gradle-plugin:2.0.0-beta7")
14+
implementation("org.jetbrains.intellij.platform:intellij-platform-gradle-plugin:2.0.0-beta8")
1515
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24")
1616
implementation("com.glovoapp.gradle:versioning:1.1.10")
1717
implementation("de.undercouch:gradle-download-task:5.6.0")

common-build-logic/src/main/kotlin/plugin-project.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import common.logBuildProfile
22
import common.logIntellijPlatformPlugin
33
import common.properties
44
import common.withSilenceLogging
5-
import gradle.kotlin.dsl.accessors._44bd68d24449dd49451fa0f0c4976aa6.intellijPlatform
65

76
plugins {
87
id("digma-base")

gradle.properties

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -47,25 +47,8 @@ org.gradle.jvmargs='-Dfile.encoding=UTF-8'
4747
### Intellij platform gradle plugin properties
4848
## see https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-gradle-properties.html
4949

50-
## todo: not sure its necessary
51-
## see https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-gradle-properties.html#useCacheRedirector
52-
#org.jetbrains.intellij.platform.buildFeature.useCacheRedirector=false
53-
5450
org.jetbrains.intellij.platform.buildFeature.downloadSources=true
5551

56-
##### about useBinaryReleases
57-
## the intellij platform gradle plugin downloads IDEs from jetbrains CDN: https://data.services.jetbrains.com/products
58-
## these are exactly the same binaries that users install.
59-
## but EAP builds are not always released to CDN, only RC are released to CDN, so when building with EAP it is not
60-
## guaranteed that we'll find it in CDN, in that case it needs to be downloaded from jetbrains maven repo.
61-
## Rider binary releases do not contain a bundled resharper sdk, maven artifacts do, and with a bundled resharper
62-
## sdk it is easier and more reliable to configure the dotnet project, that is what Rider team recommend.
63-
## So because we build with EAP ,and we build with Rider it is more convenient for us to build with maven artifacts.
64-
## useBinaryReleases=false means the IDEs will be downloaded from maven repo.
65-
## but IDEs from maven repo do not have a bundled jetbrainsRuntime and a jetbrainsRuntime() needs to be supplied
66-
## to runIde. see more info about it in the intellij platform extension configuration in the main module.
67-
org.jetbrains.intellij.platform.buildFeature.useBinaryReleases=false
68-
6952
#org.jetbrains.intellij.platform.buildFeature.useClosestVersionResolving=false
7053

7154
### Intellij platform gradle plugin properties END

jvm-common/build.gradle.kts

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,7 @@ dependencies {
4141
}
4242

4343
bundledPlugin("com.intellij.java")
44-
45-
//there is an issue with plugin verifier that prevents using bundledPlugin("org.jetbrains.kotlin") for 242.
46-
//https://youtrack.jetbrains.com/issue/MP-6594
47-
//until this issue is fixed we use a direct dependency on kotlin plugin, which is not the best but works.
48-
//todo: the dependency is on a version that i'm not sure compatible with 242
49-
if (project.currentProfile().profile > BuildProfiles.Profile.p241){
50-
plugin("org.jetbrains.kotlin","232-1.9.24-release-822-IJ10072.27")
51-
}else{
52-
bundledPlugin("org.jetbrains.kotlin")
53-
}
44+
bundledPlugin("org.jetbrains.kotlin")
5445
}
5546
}
5647

settings.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ plugins {
2121
/*
2222
kotlin-stdlib: the kotlin-stdlib must be compatible with the intellij platform version,
2323
see: https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library
24-
25-
todo: maybe use java-platforms instead of versionCatalogs
2624
*/
2725
dependencyResolutionManagement {
2826
versionCatalogs {

0 commit comments

Comments
 (0)