diff options
Diffstat (limited to 'integration-tests/gradle/projects')
21 files changed, 28 insertions, 24 deletions
diff --git a/integration-tests/gradle/projects/it-android-0/gradle.properties b/integration-tests/gradle/projects/it-android-0/gradle.properties index 2bdf43b4..f368eb83 100644 --- a/integration-tests/gradle/projects/it-android-0/gradle.properties +++ b/integration-tests/gradle/projects/it-android-0/gradle.properties @@ -1,3 +1,3 @@ -dokka_it_kotlin_version=1.3.72 +dokka_it_kotlin_version=1.6.10 dokka_it_android_gradle_plugin_version=4.0.0 android.useAndroidX=true diff --git a/integration-tests/gradle/projects/it-android-0/gradle/wrapper/gradle-wrapper.properties b/integration-tests/gradle/projects/it-android-0/gradle/wrapper/gradle-wrapper.properties index 1b16c34a..ec991f9a 100644 --- a/integration-tests/gradle/projects/it-android-0/gradle/wrapper/gradle-wrapper.properties +++ b/integration-tests/gradle/projects/it-android-0/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/integration-tests/gradle/projects/it-basic-groovy/gradle.properties b/integration-tests/gradle/projects/it-basic-groovy/gradle.properties index 7ebac3ad..04177526 100644 --- a/integration-tests/gradle/projects/it-basic-groovy/gradle.properties +++ b/integration-tests/gradle/projects/it-basic-groovy/gradle.properties @@ -1 +1 @@ -dokka_it_kotlin_version=1.3.72 +dokka_it_kotlin_version=1.6.10 diff --git a/integration-tests/gradle/projects/it-basic-groovy/gradle/wrapper/gradle-wrapper.properties b/integration-tests/gradle/projects/it-basic-groovy/gradle/wrapper/gradle-wrapper.properties index 622ab64a..ec991f9a 100644 --- a/integration-tests/gradle/projects/it-basic-groovy/gradle/wrapper/gradle-wrapper.properties +++ b/integration-tests/gradle/projects/it-basic-groovy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/integration-tests/gradle/projects/it-basic/build.gradle.kts b/integration-tests/gradle/projects/it-basic/build.gradle.kts index c9302653..f4585a87 100644 --- a/integration-tests/gradle/projects/it-basic/build.gradle.kts +++ b/integration-tests/gradle/projects/it-basic/build.gradle.kts @@ -16,7 +16,7 @@ buildscript { } } -version = "1.5-SNAPSHOT" +version = "1.6.10-SNAPSHOT" apply(from = "../template.root.gradle.kts") diff --git a/integration-tests/gradle/projects/it-basic/gradle.properties b/integration-tests/gradle/projects/it-basic/gradle.properties index 7ebac3ad..04177526 100644 --- a/integration-tests/gradle/projects/it-basic/gradle.properties +++ b/integration-tests/gradle/projects/it-basic/gradle.properties @@ -1 +1 @@ -dokka_it_kotlin_version=1.3.72 +dokka_it_kotlin_version=1.6.10 diff --git a/integration-tests/gradle/projects/it-basic/gradle/wrapper/gradle-wrapper.properties b/integration-tests/gradle/projects/it-basic/gradle/wrapper/gradle-wrapper.properties index 965a6b9e..ec991f9a 100644 --- a/integration-tests/gradle/projects/it-basic/gradle/wrapper/gradle-wrapper.properties +++ b/integration-tests/gradle/projects/it-basic/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-rc-2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/integration-tests/gradle/projects/it-collector-0/gradle.properties b/integration-tests/gradle/projects/it-collector-0/gradle.properties index 7ebac3ad..04177526 100644 --- a/integration-tests/gradle/projects/it-collector-0/gradle.properties +++ b/integration-tests/gradle/projects/it-collector-0/gradle.properties @@ -1 +1 @@ -dokka_it_kotlin_version=1.3.72 +dokka_it_kotlin_version=1.6.10 diff --git a/integration-tests/gradle/projects/it-collector-0/gradle/wrapper/gradle-wrapper.properties b/integration-tests/gradle/projects/it-collector-0/gradle/wrapper/gradle-wrapper.properties index 1b16c34a..ec991f9a 100644 --- a/integration-tests/gradle/projects/it-collector-0/gradle/wrapper/gradle-wrapper.properties +++ b/integration-tests/gradle/projects/it-collector-0/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/integration-tests/gradle/projects/it-js-ir-0/build.gradle.kts b/integration-tests/gradle/projects/it-js-ir-0/build.gradle.kts index 6f949766..ec366c9d 100644 --- a/integration-tests/gradle/projects/it-js-ir-0/build.gradle.kts +++ b/integration-tests/gradle/projects/it-js-ir-0/build.gradle.kts @@ -15,5 +15,8 @@ kotlin { dependencies { implementation(kotlin("stdlib")) implementation(npm("is-sorted", "1.0.5")) - implementation("org.jetbrains.kotlin-wrappers:kotlin-react-router-dom:${properties["dokka_it_react_kotlin_version"]}") + + val reactVersion = properties["react_version"] + implementation("org.jetbrains.kotlin-wrappers:kotlin-react:$reactVersion") + implementation("org.jetbrains.kotlin-wrappers:kotlin-react-dom:$reactVersion") }
\ No newline at end of file diff --git a/integration-tests/gradle/projects/it-js-ir-0/gradle.properties b/integration-tests/gradle/projects/it-js-ir-0/gradle.properties index 7ebac3ad..272e8f30 100644 --- a/integration-tests/gradle/projects/it-js-ir-0/gradle.properties +++ b/integration-tests/gradle/projects/it-js-ir-0/gradle.properties @@ -1 +1,2 @@ -dokka_it_kotlin_version=1.3.72 +dokka_it_kotlin_version=1.6.10 +react_version=18.0.0-pre.325-kotlin-1.6.10 diff --git a/integration-tests/gradle/projects/it-js-ir-0/gradle/wrapper/gradle-wrapper.properties b/integration-tests/gradle/projects/it-js-ir-0/gradle/wrapper/gradle-wrapper.properties index 965a6b9e..ec991f9a 100644 --- a/integration-tests/gradle/projects/it-js-ir-0/gradle/wrapper/gradle-wrapper.properties +++ b/integration-tests/gradle/projects/it-js-ir-0/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-rc-2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/integration-tests/gradle/projects/it-js-ir-0/src/main/kotlin/RootPackageClass.kt b/integration-tests/gradle/projects/it-js-ir-0/src/main/kotlin/RootPackageClass.kt index b93e180e..81c66d54 100644 --- a/integration-tests/gradle/projects/it-js-ir-0/src/main/kotlin/RootPackageClass.kt +++ b/integration-tests/gradle/projects/it-js-ir-0/src/main/kotlin/RootPackageClass.kt @@ -2,7 +2,6 @@ import org.w3c.dom.url.URLSearchParams import react.Props -import react.RComponent import react.State /** @@ -12,7 +11,8 @@ class RootPackageClass { val description = "I do live in the root package!" } -fun RComponent<*, *>.params() = URLSearchParams() +// sample method that uses classes from dom and react, should compile +fun URLSearchParams.react(props: Props, state: State) {} fun test(list: MutableList<Int>) = "list" diff --git a/integration-tests/gradle/projects/it-multimodule-0/gradle.properties b/integration-tests/gradle/projects/it-multimodule-0/gradle.properties index 7ebac3ad..04177526 100644 --- a/integration-tests/gradle/projects/it-multimodule-0/gradle.properties +++ b/integration-tests/gradle/projects/it-multimodule-0/gradle.properties @@ -1 +1 @@ -dokka_it_kotlin_version=1.3.72 +dokka_it_kotlin_version=1.6.10 diff --git a/integration-tests/gradle/projects/it-multimodule-0/gradle/wrapper/gradle-wrapper.properties b/integration-tests/gradle/projects/it-multimodule-0/gradle/wrapper/gradle-wrapper.properties index 1b16c34a..ec991f9a 100644 --- a/integration-tests/gradle/projects/it-multimodule-0/gradle/wrapper/gradle-wrapper.properties +++ b/integration-tests/gradle/projects/it-multimodule-0/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/integration-tests/gradle/projects/it-multimodule-1/build.gradle b/integration-tests/gradle/projects/it-multimodule-1/build.gradle index aa46d030..57d22b79 100644 --- a/integration-tests/gradle/projects/it-multimodule-1/build.gradle +++ b/integration-tests/gradle/projects/it-multimodule-1/build.gradle @@ -7,8 +7,8 @@ apply from: '../template.root.gradle.kts' dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib" - compile project(':first') - compile project(':second') + implementation project(':first') + implementation project(':second') } diff --git a/integration-tests/gradle/projects/it-multimodule-1/gradle.properties b/integration-tests/gradle/projects/it-multimodule-1/gradle.properties index 80455dd0..04177526 100644 --- a/integration-tests/gradle/projects/it-multimodule-1/gradle.properties +++ b/integration-tests/gradle/projects/it-multimodule-1/gradle.properties @@ -1 +1 @@ -dokka_it_kotlin_version=1.4.0 +dokka_it_kotlin_version=1.6.10 diff --git a/integration-tests/gradle/projects/it-multimodule-1/gradle/wrapper/gradle-wrapper.properties b/integration-tests/gradle/projects/it-multimodule-1/gradle/wrapper/gradle-wrapper.properties index ba94df84..ec991f9a 100644 --- a/integration-tests/gradle/projects/it-multimodule-1/gradle/wrapper/gradle-wrapper.properties +++ b/integration-tests/gradle/projects/it-multimodule-1/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/integration-tests/gradle/projects/it-multimodule-versioning-0/gradle.properties b/integration-tests/gradle/projects/it-multimodule-versioning-0/gradle.properties index 9f540b69..a4f2b91c 100644 --- a/integration-tests/gradle/projects/it-multimodule-versioning-0/gradle.properties +++ b/integration-tests/gradle/projects/it-multimodule-versioning-0/gradle.properties @@ -1,2 +1,2 @@ -dokka_it_kotlin_version=1.4.0 -#org.gradle.debug = true +dokka_it_kotlin_version=1.6.10 + diff --git a/integration-tests/gradle/projects/it-multiplatform-0/gradle.properties b/integration-tests/gradle/projects/it-multiplatform-0/gradle.properties index 80455dd0..04177526 100644 --- a/integration-tests/gradle/projects/it-multiplatform-0/gradle.properties +++ b/integration-tests/gradle/projects/it-multiplatform-0/gradle.properties @@ -1 +1 @@ -dokka_it_kotlin_version=1.4.0 +dokka_it_kotlin_version=1.6.10 diff --git a/integration-tests/gradle/projects/it-multiplatform-0/gradle/wrapper/gradle-wrapper.properties b/integration-tests/gradle/projects/it-multiplatform-0/gradle/wrapper/gradle-wrapper.properties index 1b16c34a..ec991f9a 100644 --- a/integration-tests/gradle/projects/it-multiplatform-0/gradle/wrapper/gradle-wrapper.properties +++ b/integration-tests/gradle/projects/it-multiplatform-0/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists |