Skip to content

Update to version 1.2.40 #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zarechenskiy merged 5 commits into from
Apr 19, 2018
Merged

Update to version 1.2.40 #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ab0041e
build configuration moved
Kordyjan Mar 29, 2018
aad4ee9
Fixed tests not starting on macs
Kordyjan Apr 3, 2018
fa0ece2
Post 1.2.31 review fixes
Kordyjan Apr 4, 2018
ce2d49b
Update to Kotlin 1.2.40 version
Kordyjan Mar 29, 2018
c44856b
Kotlin version specification in mvn changed
Kordyjan Apr 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 0 additions & 34 deletions .teamcity/Kotlin_KotlinEclipse/Project.kt
View file
Open in desktop

This file was deleted.

49 changes: 0 additions & 49 deletions .teamcity/Kotlin_KotlinEclipse/buildTypes/Kotlin_KotlinEclipse_EclipsePluginDev.kt
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions .teamcity/Kotlin_KotlinEclipse/settings.kts
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions ...ipse/vcsRoots/Kotlin_KotlinEclipse_HttpsGithubComJetBrainsKotlinEclipseRefsHeadsMaster.kt
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions ...in_KotlinEclipse/vcsRoots/Kotlin_KotlinEclipse_HttpsGithubComWpopielarskiKotlinEclipse.kt
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions ...sRoots/Kotlin_KotlinEclipse_HttpsGithubComWpopielarskiKotlinEclipseRefsHeadsBumpTo1230.kt
View file
Open in desktop

This file was deleted.

104 changes: 0 additions & 104 deletions .teamcity/pom.xml
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions kotlin-bundled-compiler/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Bundled Kotlin Compiler
Bundle-SymbolicName: org.jetbrains.kotlin.bundled-compiler;singleton:=true
Bundle-Version: 0.8.3.qualifier
Bundle-Version: 0.8.4.qualifier
Bundle-Vendor: JetBrains
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ClassPath: .,
Expand Down Expand Up @@ -338,7 +338,6 @@ Export-Package:
org.jetbrains.kotlin.serialization.builtins,
org.jetbrains.kotlin.serialization.deserialization,
org.jetbrains.kotlin.serialization.deserialization.descriptors,
org.jetbrains.kotlin.serialization.jvm,
org.jetbrains.kotlin.storage,
org.jetbrains.kotlin.synthetic,
org.jetbrains.kotlin.types,
Expand Down
10 changes: 5 additions & 5 deletions kotlin-bundled-compiler/get_bundled.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<project default="get_bundled">
<property name="compiler.tag" value="1.2.31" />
<property name="compiler.tag" value="1.2.40" />
<property name="bootstrap_branch" value=""/>
<property name="idea-version" value="162.1812.17"/>

<property name="compiler.query" value="1334344:id" />
<property name="compiler.query" value="1395958:id" />

<property name="teamcity-base" value="https://teamcity.jetbrains.com"/>

<property name="kotlin-idea-compatible-version" value="IJ2017.3-1" />
<property name="kotlin-version" value="1.2.30" />
<property name="teamcity-kotlin-url" value = "${teamcity-base}/guestAuth/repository/download/Kotlin_1230_CompilerAllPlugins/${compiler.query}" />
<property name="kotlin-version" value="1.2.40" />
<property name="teamcity-kotlin-url" value = "${teamcity-base}/guestAuth/repository/download/Kotlin_1240_CompilerAllPlugins/${compiler.query}" />

<property name="idea-sdk-url" value="https://www.jetbrains.com/intellij-repository/releases/com/jetbrains/intellij/idea" />

Expand Down Expand Up @@ -238,7 +238,7 @@
</unzip>

<!-- Also retrivive sources -->
<get src="${teamcity-kotlin-url}/maven/org/jetbrains/kotlin/kotlin-compiler/1.2.30/kotlin-compiler-1.2.30-sources.jar"
<get src="${teamcity-kotlin-url}/maven/org/jetbrains/kotlin/kotlin-compiler/${kotlin-version}/kotlin-compiler-${kotlin-version}-sources.jar"
dest="${download.dir}/${compiler-sources-file}" usetimestamp="true" />
<!-- Get idea sources -->
<get src="${idea-sdk-url}/ideaIC/${idea-version}/ideaIC-${idea-version}-sources.jar" dest="${download.dir}/idea-sdk-sources.jar" usetimestamp="true" />
Expand Down
2 changes: 1 addition & 1 deletion kotlin-bundled-compiler/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<relativePath>../pom.xml</relativePath>
<groupId>kotlin.eclipse</groupId>
<artifactId>kotlin.eclipse.plugin</artifactId>
<version>0.8.3-SNAPSHOT</version>
<version>0.8.4-SNAPSHOT</version>
</parent>

<artifactId>org.jetbrains.kotlin.bundled-compiler</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion kotlin-eclipse-aspects/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: kotlin-eclipse-aspects
Bundle-SymbolicName: org.jetbrains.kotlin.aspects
Bundle-Version: 0.8.3.qualifier
Bundle-Version: 0.8.4.qualifier
Bundle-Activator: org.jetbrains.kotlin.aspects.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
Expand Down
2 changes: 1 addition & 1 deletion kotlin-eclipse-aspects/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<relativePath>../pom.xml</relativePath>
<groupId>kotlin.eclipse</groupId>
<artifactId>kotlin.eclipse.plugin</artifactId>
<version>0.8.3-SNAPSHOT</version>
<version>0.8.4-SNAPSHOT</version>
</parent>

<artifactId>org.jetbrains.kotlin.aspects</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion kotlin-eclipse-core/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: kotlin-eclipse-core
Bundle-SymbolicName: org.jetbrains.kotlin.core;singleton:=true
Bundle-Version: 0.8.3.qualifier
Bundle-Version: 0.8.4.qualifier
Bundle-Activator: org.jetbrains.kotlin.core.Activator
Bundle-Vendor: JetBrains
Require-Bundle: org.jetbrains.kotlin.bundled-compiler,
Expand Down
2 changes: 1 addition & 1 deletion kotlin-eclipse-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<relativePath>../pom.xml</relativePath>
<groupId>kotlin.eclipse</groupId>
<artifactId>kotlin.eclipse.plugin</artifactId>
<version>0.8.3-SNAPSHOT</version>
<version>0.8.4-SNAPSHOT</version>
</parent>

<artifactId>org.jetbrains.kotlin.core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion kotlin-eclipse-core/src/org/jetbrains/kotlin/core/asJava/KotlinLightClassGeneration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ object KotlinLightClassGeneration {
override fun shouldGenerateScript(script: KtScript): Boolean = false

override fun shouldGenerateClassMembers(processingClassOrObject: KtClassOrObject): Boolean {
return shouldGenerateClass(processingClassOrObject) ||
return super.shouldGenerateClassMembers(processingClassOrObject) ||
processingClassOrObject.hasModifier(KtTokens.COMPANION_KEYWORD)
}
}).build()
Expand Down
16 changes: 11 additions & 5 deletions kotlin-eclipse-core/src/org/jetbrains/kotlin/core/model/KotlinCommonEnvironment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ import org.jetbrains.kotlin.script.ScriptHelperImpl
import com.intellij.lang.jvm.facade.JvmElementProvider
import org.jetbrains.kotlin.resolve.ModuleAnnotationsResolver
import org.jetbrains.kotlin.cli.jvm.compiler.CliModuleAnnotationsResolver
import org.jetbrains.kotlin.cli.jvm.compiler.CliTraceHolder
import org.jetbrains.kotlin.cli.jvm.compiler.CliKotlinAsJavaSupport

private fun setIdeaIoUseFallback() {
if (SystemInfo.isWindows) {
Expand Down Expand Up @@ -160,15 +162,19 @@ abstract class KotlinCommonEnvironment(disposable: Disposable) {
registerService(ExternalAnnotationsManager::class.java, MockExternalAnnotationsManager())
registerService(InferredAnnotationsManager::class.java, MockInferredAnnotationsManager())

val cliLightClassGenerationSupport = CliLightClassGenerationSupport(project)
registerService(LightClassGenerationSupport::class.java, cliLightClassGenerationSupport)
registerService(CliLightClassGenerationSupport::class.java, cliLightClassGenerationSupport)
registerService(CodeAnalyzerInitializer::class.java, cliLightClassGenerationSupport)
val traceHolder = CliTraceHolder().also {
registerService(CodeAnalyzerInitializer::class.java, it)
}

CliLightClassGenerationSupport(traceHolder).also {
registerService(LightClassGenerationSupport::class.java, it)
registerService(CliLightClassGenerationSupport::class.java, it)
}

registerService(JavaModuleResolver::class.java, EclipseKotlinJavaModuleResolver())

val area = Extensions.getArea(this)
area.getExtensionPoint(PsiElementFinder.EP_NAME).registerExtension(JavaElementFinder(this, cliLightClassGenerationSupport))
area.getExtensionPoint(PsiElementFinder.EP_NAME).registerExtension(JavaElementFinder(this, CliKotlinAsJavaSupport(project, traceHolder)))
area.getExtensionPoint(PsiElementFinder.EP_NAME).registerExtension(
PsiElementFinderImpl(this, ServiceManager.getService(this, JavaFileManager::class.java)))
}
Expand Down
Loading