azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixup the tests vs master-gradle-plugin

Browse Source 
Defined 4.0 and 1.3.0 as default versions of Gradle and plugin for PluginTargetVersions
Use `{{kotlin_plugin_repositories}}` template in testData of ImportTests
Update "mute" databases for new tests

Add `kotlin.stdlib.default.dependency=false` to some testData
This commit is contained in:
Alexander Dudinsky
2020-07-09 12:03:26 +03:00
parent 005314ce06
commit d89083cd8c
40 changed files with 131 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/build.gradle
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ plugins {
id 'org.jetbrains.kotlin.multiplatform' version '{{kotlin_plugin_version}}'
}
repositories {
mavenCentral()
{{kotlin_plugin_repositories}}
}
group 'com.example'
version '0.0.1'
idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/settings.gradle
Vendored
+6
View File
@@ -1,3 +1,9 @@
pluginManagement {
repositories {
{{kotlin_plugin_repositories}}
}
}
rootProject.name = 'mppLibrary'
enableFeaturePreview('GRADLE_METADATA')
idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/build.gradle
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ plugins {
id 'org.jetbrains.kotlin.multiplatform' version '{{kotlin_plugin_version}}'
}
repositories {
mavenCentral()
{{kotlin_plugin_repositories}}
}
group 'com.example'
version '0.0.1'
idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/settings.gradle
Vendored
+6
View File
@@ -1,3 +1,9 @@
pluginManagement {
repositories {
{{kotlin_plugin_repositories}}
}
}
rootProject.name = 'mppLibrary'
enableFeaturePreview('GRADLE_METADATA')
idea/testData/gradle/kaptImportingTest/modulePerSourceSet/build.gradle
Vendored
+1 -3
View File
@@ -1,9 +1,7 @@
buildscript {
ext.kotlin_version = '{{kotlin_plugin_version}}'
repositories {
google()
jcenter()
{{kotlin_plugin_repositories}}
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.0'
idea/testData/gradle/kaptImportingTest/modulePerSourceSet/gradle.properties
Vendored
+1
View File
@@ -0,0 +1 @@
kotlin.stdlib.default.dependency=false
idea/testData/gradle/kaptImportingTest/modulePerSourceSetDisabled/build.gradle
Vendored
+1 -3
View File
@@ -1,9 +1,7 @@
buildscript {
ext.kotlin_version = '{{kotlin_plugin_version}}'
repositories {
google()
jcenter()
{{kotlin_plugin_repositories}}
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.0'
idea/testData/gradle/kaptImportingTest/modulePerSourceSetDisabled/gradle.properties
Vendored
+1
View File
@@ -0,0 +1 @@
kotlin.stdlib.default.dependency=false
idea/testData/gradle/multiplatform/dependenciesReachableViaImpl/build.gradle
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
buildscript {
repositories {
mavenCentral()
{{kotlin_plugin_repositories}}
}
dependencies {
idea/testData/gradle/multiplatform/jsProductionOutputFile/build.gradle
Vendored
+1 -2
View File
@@ -1,7 +1,6 @@
buildscript {
repositories {
jcenter()
maven { url 'https://maven.google.com' }
{{kotlin_plugin_repositories}}
}
dependencies {
idea/testData/gradle/multiplatform/jsTestOutputFile/build.gradle
Vendored
+1 -2
View File
@@ -1,7 +1,6 @@
buildscript {
repositories {
jcenter()
maven { url 'https://maven.google.com' }
{{kotlin_plugin_repositories}}
}
dependencies {
idea/testData/gradle/multiplatform/jsTestOutputFileInProjectWithAndroid/build.gradle
Vendored
+1 -2
View File
@@ -1,7 +1,6 @@
buildscript {
repositories {
jcenter()
maven { url 'https://maven.google.com' }
{{kotlin_plugin_repositories}}
}
dependencies {
idea/testData/gradle/multiplatform/jsTestOutputFileInProjectWithAndroid/project1/build.gradle
Vendored
+1 -2
View File
@@ -1,7 +1,6 @@
buildscript {
repositories {
jcenter()
maven { url 'https://maven.google.com' }
{{kotlin_plugin_repositories}}
}
dependencies {
idea/testData/gradle/multiplatform/jsTestOutputFileInProjectWithAndroid/project2/build.gradle
Vendored
+1 -2
View File
@@ -1,7 +1,6 @@
buildscript {
repositories {
jcenter()
maven { url 'https://maven.google.com' }
{{kotlin_plugin_repositories}}
}
dependencies {
idea/testData/gradle/multiplatform/jsTestOutputFileInProjectWithAndroid/project3/build.gradle
Vendored
+1 -2
View File
@@ -1,7 +1,6 @@
buildscript {
repositories {
jcenter()
maven { url 'https://maven.google.com' }
{{kotlin_plugin_repositories}}
}
dependencies {
idea/testData/gradle/multiplatform/multiProject/build.gradle
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
buildscript {
repositories {
mavenCentral()
{{kotlin_plugin_repositories}}
}
dependencies {
idea/testData/gradle/multiplatform/multiProject/gradle.properties
Vendored
+1
View File
@@ -0,0 +1 @@
kotlin.stdlib.default.dependency=false
idea/testData/gradle/multiplatform/platformToCommonDependency/build.gradle
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
buildscript {
repositories {
mavenCentral()
{{kotlin_plugin_repositories}}
}
dependencies {
idea/testData/gradle/multiplatform/platformToCommonDependencyRoot/build.gradle
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
buildscript {
repositories {
mavenCentral()
{{kotlin_plugin_repositories}}
}
dependencies {
idea/testData/gradle/multiplatform/platformToCommonExpectedByDependency/build.gradle
Vendored
+1 -2
View File
@@ -1,7 +1,6 @@
buildscript {
repositories {
mavenCentral()
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
{{kotlin_plugin_repositories}}
}
dependencies {
idea/testData/gradle/multiplatform/simpleAndroidAppWithCommonModule/build.gradle
Vendored
+1 -2
View File
@@ -1,7 +1,6 @@
buildscript {
repositories {
jcenter()
maven { url 'https://maven.google.com' }
{{kotlin_plugin_repositories}}
}
dependencies {
idea/testData/gradle/multiplatform/transitiveImplement/build.gradle
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
buildscript {
repositories {
mavenCentral()
{{kotlin_plugin_repositories}}
}
dependencies {
idea/testData/gradle/multiplatform/transitiveImplement/gradle.properties
Vendored
+1
View File
@@ -0,0 +1 @@
kotlin.stdlib.default.dependency=false
idea/testData/gradle/multiplatform/transitiveImplementWithAndroid/build.gradle
Vendored
+1 -2
View File
@@ -1,7 +1,6 @@
buildscript {
repositories {
jcenter()
maven { url 'https://maven.google.com' }
{{kotlin_plugin_repositories}}
}
dependencies {
idea/testData/gradle/multiplatform/transitiveImplementWithNonDefaultConfig/build.gradle
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
buildscript {
repositories {
mavenCentral()
{{kotlin_plugin_repositories}}
}
dependencies {
idea/testData/gradle/multiplatform/transitiveImplementWithNonDefaultConfig/gradle.properties
Vendored
+1
View File
@@ -0,0 +1 @@
kotlin.stdlib.default.dependency=false
idea/testData/gradle/packagePrefixImport/packagePrefixNonMPP/build.gradle
Vendored
+1 -2
View File
@@ -1,7 +1,6 @@
buildscript {
repositories {
mavenCentral()
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
{{kotlin_plugin_repositories}}
}
dependencies {