Skip to content

Commit 1c1d592

Browse files
committed
Revert gradle inspections for KT-12730
Revert "Disable local mirrors for public teamcity" This reverts commit b0d85e8. Revert "Tests for Gradle inspections with configured Gradle project" This reverts commit f1666b8. Revert "Warn about using different versions of Kotlin plugin and standard library in Gradle (KT-12730)" This reverts commit 54f891a. Revert "Fix getting external path for retrieving gradle model" This reverts commit 8a920f8. Revert "Refactoring: extract method for getting Kotlin plugin version and remove findAllRecursively usage" This reverts commit fc8f5d9. Revert "Use internalName for compare with module name" This reverts commit 63e6028. Revert "Minor: add some comments after review" This reverts commit c292471. Revert "Support multi-module environment in DifferentKotlinGradleVersionInspection" This reverts commit 9c0e33d. Revert "Make DifferentKotlinGradleVersionInspection inpection work for classpath call with braces" This reverts commit e3fc1d8. Revert "Fix bad refactoring" This reverts commit 70f8880. Revert "Refactoring: extract strings" This reverts commit 2a5e204. Revert "Fallback to properly resolved version if heuristic doesn't work in DifferentKotlinGradleVersionInspection" This reverts commit a5555d3. Revert "Add inspection that warns if Gradle plugin version differs from the one in IDE (KT-12730)" This reverts commit 3c5c382.
1 parent f7bba3b commit 1c1d592

29 files changed

+34
-1778
lines changed

ChangeLog.md

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
### Language features
99

1010
+ **Coroutines (async/await, generators)** ([proposal](https://github.com/Kotlin/kotlin-coroutines))
11-
11+
1212
Current limitations:
13-
13+
1414
- for some cases type inference is not supported yet
1515
- limited IDE support
16-
- allowed only one `handleResult` function: [design](https://github.com/Kotlin/kotlin-coroutines/blob/master/kotlin-coroutines-informal.md#result-handlers)
16+
- allowed only one `handleResult` function: [design](https://github.com/Kotlin/kotlin-coroutines/blob/master/kotlin-coroutines-informal.md#result-handlers)
1717
- handling `finally` blocks is not supported: [issue](https://github.com/Kotlin/kotlin-coroutines/issues/1)
1818

1919
+ **Bound callable references** ([proposal](https://github.com/Kotlin/KEEP/issues/5))
@@ -49,13 +49,13 @@ and related functionality, except the following parts:
4949

5050
###### Issues fixed
5151
- [`KT-4779`](https://youtrack.jetbrains.com/issue/KT-4779) Generate default methods for implementations in interfaces
52-
- [`KT-11780`](https://youtrack.jetbrains.com/issue/KT-11780) Fixed incorrect "No cast needed" warning
52+
- [`KT-11780`](https://youtrack.jetbrains.com/issue/KT-11780) Fixed incorrect "No cast needed" warning
5353
- [`KT-12156`](https://youtrack.jetbrains.com/issue/KT-12156) Fixed incorrect error on `inline` modifier inside final class
5454
- [`KT-12358`](https://youtrack.jetbrains.com/issue/KT-12358) Report missing error "Abstract member not implemented" when a fake method of 'Any' is inherited from an interface
5555
- [`KT-6206`](https://youtrack.jetbrains.com/issue/KT-6206) Generate equals/hashCode/toString in data class always unless it'll cause a JVM signature clash error
56-
- [`KT-8990`](https://youtrack.jetbrains.com/issue/KT-8990) Fixed incorrect error "virtual member hidden" for a private method of an inner class
57-
- [`KT-12429`](https://youtrack.jetbrains.com/issue/KT-12429) Fixed visibility checks for annotation usage on top-level declarations
58-
- [`KT-5068`](https://youtrack.jetbrains.com/issue/KT-5068) Introduced a special diagnostic message for "type mismatch" errors such as `fun f(): Int = { 1 }`.
56+
- [`KT-8990`](https://youtrack.jetbrains.com/issue/KT-8990) Fixed incorrect error "virtual member hidden" for a private method of an inner class
57+
- [`KT-12429`](https://youtrack.jetbrains.com/issue/KT-12429) Fixed visibility checks for annotation usage on top-level declarations
58+
- [`KT-5068`](https://youtrack.jetbrains.com/issue/KT-5068) Introduced a special diagnostic message for "type mismatch" errors such as `fun f(): Int = { 1 }`.
5959

6060
### Standard Library
6161

@@ -71,26 +71,20 @@ These artifacts include extensions for the types available in the latter JDKs, s
7171
+ **"Leaking this" inspection**
7272

7373
This inspection reports dangerous operations inside constructors including:
74-
74+
7575
- Accessing non-final property in constructor
7676
- Calling non-final function in constructor
7777
- Using 'this' as function argument in constructor of non-final class
7878

79+
+ [`KT-12019`](https://youtrack.jetbrains.com/issue/KT-12019) Introduce "redundant `if`" inspection
80+
7981
###### Issues fixed
8082

8183
+ [`KT-12389`](https://youtrack.jetbrains.com/issue/KT-12389) Do not exit from REPL when toString() of user class throws an exception
8284
+ [`KT-12129`](https://youtrack.jetbrains.com/issue/KT-12129) Fixed link on api reference page in KDoc
8385

8486
## 1.0.4
8587

86-
### IDE
87-
88-
###### New features
89-
90-
- [`KT-12730`](https://youtrack.jetbrains.com/issue/KT-12730) Warn about using different versions of Kotlin Gradle plugin and bundled compiler.
91-
- [`KT-12019`](https://youtrack.jetbrains.com/issue/KT-12019) Introduce "redundant `if`" inspection
92-
- [`KT-12730`](https://youtrack.jetbrains.com/issue/KT-12730) Warn about using different versions of Kotlin plugin and standard library in Gradle
93-
9488
## 1.0.3
9589

9690
### Compiler

idea/resources/inspectionDescriptions/DifferentKotlinGradleVersion.html

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

idea/resources/inspectionDescriptions/DifferentStdlibGradleVersion.html

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

idea/src/META-INF/gradle.xml

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,8 @@
11
<idea-plugin>
2-
<extensions defaultExtensionNs="org.jetbrains.kotlin">
3-
<projectConfigurator implementation="org.jetbrains.kotlin.idea.configuration.KotlinGradleModuleConfigurator"/>
4-
</extensions>
5-
<extensions defaultExtensionNs="org.jetbrains.plugins.gradle">
6-
<frameworkSupport implementation="org.jetbrains.kotlin.idea.configuration.GradleKotlinJavaFrameworkSupportProvider"/>
7-
</extensions>
8-
<extensions defaultExtensionNs="com.intellij">
9-
<localInspection
10-
implementationClass="org.jetbrains.kotlin.idea.inspections.gradle.DifferentKotlinGradleVersionInspection"
11-
displayName="Kotlin Gradle and IDE plugins versions are different"
12-
groupName="Kotlin"
13-
enabledByDefault="true"
14-
language="Groovy"
15-
hasStaticDescription="true"
16-
level="WARNING"/>
17-
</extensions>
18-
19-
<extensions defaultExtensionNs="com.intellij">
20-
<localInspection
21-
implementationClass="org.jetbrains.kotlin.idea.inspections.gradle.DifferentStdlibGradleVersionInspection"
22-
displayName="Kotlin library and Gradle plugin versions are different"
23-
groupName="Kotlin"
24-
enabledByDefault="true"
25-
language="Groovy"
26-
hasStaticDescription="true"
27-
level="WARNING"/>
28-
</extensions>
2+
<extensions defaultExtensionNs="org.jetbrains.kotlin">
3+
<projectConfigurator implementation="org.jetbrains.kotlin.idea.configuration.KotlinGradleModuleConfigurator"/>
4+
</extensions>
5+
<extensions defaultExtensionNs="org.jetbrains.plugins.gradle">
6+
<frameworkSupport implementation="org.jetbrains.kotlin.idea.configuration.GradleKotlinJavaFrameworkSupportProvider"/>
7+
</extensions>
298
</idea-plugin>

idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,7 @@
5757
public abstract class KotlinWithGradleConfigurator implements KotlinProjectConfigurator {
5858
private static final String VERSION_TEMPLATE = "$VERSION$";
5959

60-
public static final String GROUP_ID = "org.jetbrains.kotlin";
61-
public static final String GRADLE_PLUGIN_ID = "kotlin-gradle-plugin";
62-
63-
protected static final String CLASSPATH = "classpath \"" + GROUP_ID + ":" + GRADLE_PLUGIN_ID + ":$kotlin_version\"";
60+
protected static final String CLASSPATH = "classpath \"org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version\"";
6461

6562
protected static final String SNAPSHOT_REPOSITORY = "maven {\nurl '" + ConfigureKotlinInProjectUtilsKt.SNAPSHOT_REPOSITORY.getUrl() + "'\n}";
6663
protected static final String EAP_REPOSITORY = "maven {\nurl '" + ConfigureKotlinInProjectUtilsKt.EAP_REPOSITORY.getUrl() + "'\n}";

idea/src/org/jetbrains/kotlin/idea/inspections/gradle/DifferentKotlinGradleVersionInspection.kt

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

idea/src/org/jetbrains/kotlin/idea/inspections/gradle/DifferentStdlibGradleVersionInspection.kt

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

0 commit comments

Comments
 (0)