Bump intellijSdk version for 203

This commit is contained in:
Florian Kistner
2020-07-06 15:28:10 +02:00
parent 1c4d7c5772
commit 202a55cb39
4 changed files with 13 additions and 7 deletions
+4 -4
View File
@@ -1,16 +1,15 @@
@file:Suppress("PropertyName", "HasPlatformType", "UnstableApiUsage") @file:Suppress("PropertyName", "HasPlatformType", "UnstableApiUsage")
import org.gradle.internal.os.OperatingSystem import org.gradle.internal.os.OperatingSystem
import org.jetbrains.kotlin.gradle.tasks.internal.CleanableStore
import java.io.Closeable import java.io.Closeable
import java.io.OutputStreamWriter import java.io.OutputStreamWriter
import java.net.URI import java.net.URI
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.*
import javax.xml.stream.XMLOutputFactory
import org.jetbrains.kotlin.gradle.tasks.internal.CleanableStore
import java.time.Duration import java.time.Duration
import java.time.Instant import java.time.Instant
import java.util.*
import javax.xml.stream.XMLOutputFactory
plugins { plugins {
base base
@@ -180,6 +179,7 @@ val mergeSources by tasks.creating(Jar::class.java) {
dependsOn(sources) dependsOn(sources)
isPreserveFileTimestamps = false isPreserveFileTimestamps = false
isReproducibleFileOrder = true isReproducibleFileOrder = true
isZip64 = true
if (!kotlinBuildProperties.isTeamcityBuild) { if (!kotlinBuildProperties.isTeamcityBuild) {
from(provider { sources.map(::zipTree) }) from(provider { sources.map(::zipTree) })
} }
@@ -26,7 +26,7 @@ fun CompatibilityPredicate.or(other: CompatibilityPredicate): CompatibilityPredi
} }
enum class Platform : CompatibilityPredicate { enum class Platform : CompatibilityPredicate {
P183, P191, P192, P193, P201, P202; P183, P191, P192, P193, P201, P202, P203;
val version: Int = name.drop(1).toInt() val version: Int = name.drop(1).toInt()
@@ -48,6 +48,7 @@ enum class Ide(val platform: Platform) : CompatibilityPredicate {
IJ193(Platform.P193), IJ193(Platform.P193),
IJ201(Platform.P201), IJ201(Platform.P201),
IJ202(Platform.P202), IJ202(Platform.P202),
IJ203(Platform.P203),
AS35(Platform.P183), AS35(Platform.P183),
AS36(Platform.P192), AS36(Platform.P192),
+4 -1
View File
@@ -62,9 +62,12 @@ dependencies {
) )
} }
} }
Platform[202].orHigher { Platform[202] {
testCompile(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-1") } testCompile(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-1") }
} }
Platform[203].orHigher {
testCompile(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-2") }
}
testCompile(intellijDep()) { testCompile(intellijDep()) {
includeJars( includeJars(
"jps-model", "jps-model",
+3 -1
View File
@@ -207,8 +207,10 @@ dependencies {
fatJarContents(intellijCoreDep()) { includeJars("intellij-core") } fatJarContents(intellijCoreDep()) { includeJars("intellij-core") }
fatJarContents(intellijDep()) { includeJars("jna-platform") } fatJarContents(intellijDep()) { includeJars("jna-platform") }
if (Platform.P202.orHigher()) { if (Platform.P202()) {
fatJarContents(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-1") } fatJarContents(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-1") }
} else if (Platform.P203.orHigher()) {
fatJarContents(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-2") }
} }
if (Platform.P192.orHigher()) { if (Platform.P192.orHigher()) {