diff --git a/examples/intelliJPlugin/build.gradle.kts b/examples/intelliJPlugin/build.gradle.kts index 769f444ae9..1af7f717a4 100644 --- a/examples/intelliJPlugin/build.gradle.kts +++ b/examples/intelliJPlugin/build.gradle.kts @@ -1,11 +1,12 @@ import org.jetbrains.compose.compose plugins { - id("org.jetbrains.intellij") version "0.6.5" + id("org.jetbrains.intellij") version "1.1.4" java kotlin("jvm") version "1.5.21" // __LATEST_COMPOSE_RELEASE_VERSION__ id("org.jetbrains.compose") version "1.0.0-alpha1-rc1" + id("idea") } group = "org.example" @@ -19,17 +20,12 @@ repositories { dependencies { implementation(compose.desktop.currentOs) - testCompile("junit", "junit", "4.12") + testImplementation("junit", "junit", "4.12") } // See https://github.com/JetBrains/gradle-intellij-plugin/ intellij { - version = "2021.2" -} -tasks.getByName("patchPluginXml") { - changeNotes(""" - Add change notes here.
- most HTML tags may be used""") + version.set("2021.2") } tasks.withType { diff --git a/examples/intelliJPlugin/gradle/wrapper/gradle-wrapper.properties b/examples/intelliJPlugin/gradle/wrapper/gradle-wrapper.properties index 7665b0fa93..3c4101c3ec 100644 --- a/examples/intelliJPlugin/gradle/wrapper/gradle-wrapper.properties +++ b/examples/intelliJPlugin/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/examples/intelliJPlugin/src/main/kotlin/com/jetbrains/compose/widgets/LazyScrollable.kt b/examples/intelliJPlugin/src/main/kotlin/com/jetbrains/compose/widgets/LazyScrollable.kt index 320b86ef49..e5bba421a0 100755 --- a/examples/intelliJPlugin/src/main/kotlin/com/jetbrains/compose/widgets/LazyScrollable.kt +++ b/examples/intelliJPlugin/src/main/kotlin/com/jetbrains/compose/widgets/LazyScrollable.kt @@ -24,7 +24,6 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -@OptIn(ExperimentalFoundationApi::class) @Composable fun LazyScrollable() { MaterialTheme { @@ -46,9 +45,7 @@ fun LazyScrollable() { VerticalScrollbar( modifier = Modifier.align(Alignment.CenterEnd).fillMaxHeight(), adapter = rememberScrollbarAdapter( - scrollState = state, - itemCount = itemCount, - averageItemSize = 37.dp // TextBox height + Spacer height + scrollState = state ) ) }