Skip to content

Commit

Permalink
Move examples to 1.0.0-beta5
Browse files Browse the repository at this point in the history
  • Loading branch information
@olonho
olonho committed Oct 28, 2021
1 parent d2bdff3 commit 01530c0
Show file tree
Hide file tree
Showing 16 changed files with 16 additions and 27 deletions.
2 changes: 1 addition & 1 deletion examples/codeviewer/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {

dependencies {
// __LATEST_COMPOSE_RELEASE_VERSION__
classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-beta1")
classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-beta5")
classpath("com.android.tools.build:gradle:4.2.2")
// __KOTLIN_COMPOSE_VERSION__
classpath(kotlin("gradle-plugin", version = "1.5.31"))
Expand Down
2 changes: 1 addition & 1 deletion examples/falling-balls-web/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat

plugins {
kotlin("multiplatform") version "1.5.31"
id("org.jetbrains.compose") version "1.0.0-beta1"
id("org.jetbrains.compose") version "1.0.0-beta5"
}

version = "1.0-SNAPSHOT"
Expand Down
2 changes: 1 addition & 1 deletion examples/falling-balls/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
// __KOTLIN_COMPOSE_VERSION__
kotlin("jvm") version "1.5.31"
// __LATEST_COMPOSE_RELEASE_VERSION__
id("org.jetbrains.compose") version "1.0.0-beta1"
id("org.jetbrains.compose") version "1.0.0-beta5"
}

group = "me.user"
Expand Down
9 changes: 0 additions & 9 deletions examples/falling-balls/settings.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1 @@
pluginManagement {
repositories {
gradlePluginPortal()
mavenCentral()
maven { url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") }
}

}
rootProject.name = "falling_balls"

2 changes: 1 addition & 1 deletion examples/imageviewer/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {

dependencies {
// __LATEST_COMPOSE_RELEASE_VERSION__
classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-beta1")
classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-beta5")
classpath("com.android.tools.build:gradle:4.1.0")
classpath(kotlin("gradle-plugin", version = "1.5.31"))
}
Expand Down
2 changes: 1 addition & 1 deletion examples/issues/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {

dependencies {
// __LATEST_COMPOSE_RELEASE_VERSION__
classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-beta1")
classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-beta5")
classpath("com.android.tools.build:gradle:4.1.3")
// __KOTLIN_COMPOSE_VERSION__
classpath(kotlin("gradle-plugin", version = "1.5.31"))
Expand Down
2 changes: 1 addition & 1 deletion examples/notepad/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
// __KOTLIN_COMPOSE_VERSION__
kotlin("jvm") version "1.5.31"
// __LATEST_COMPOSE_RELEASE_VERSION__
id("org.jetbrains.compose") version ("1.0.0-beta1")
id("org.jetbrains.compose") version ("1.0.0-beta5")
}

repositories {
Expand Down
2 changes: 1 addition & 1 deletion examples/todoapp-lite/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {

dependencies {
// __LATEST_COMPOSE_RELEASE_VERSION__
classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-beta1")
classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-beta5")
classpath("com.android.tools.build:gradle:4.1.0")
classpath(kotlin("gradle-plugin", version = "1.5.31"))
}
Expand Down
4 changes: 2 additions & 2 deletions examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ object Deps {
object JetBrains {
object Kotlin {
// __KOTLIN_COMPOSE_VERSION__
private const val VERSION = "1.5.21"
private const val VERSION = "1.5.31"
const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$VERSION"
const val testCommon = "org.jetbrains.kotlin:kotlin-test-common:$VERSION"
const val testJunit = "org.jetbrains.kotlin:kotlin-test-junit:$VERSION"
Expand All @@ -13,7 +13,7 @@ object Deps {

object Compose {
// __LATEST_COMPOSE_RELEASE_VERSION__
private const val VERSION = "1.0.0-alpha2"
private const val VERSION = "1.0.0-beta5"
const val gradlePlugin = "org.jetbrains.compose:compose-gradle-plugin:$VERSION"
}
}
Expand Down
4 changes: 1 addition & 3 deletions ...les/todoapp/common/compose-ui/src/desktopMain/kotlin/example/todo/common/ui/Scrollbars.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ actual fun rememberScrollbarAdapter(
averageItemSize: Dp
): ScrollbarAdapter =
androidx.compose.foundation.rememberScrollbarAdapter(
scrollState = scrollState,
itemCount = itemCount,
averageItemSize = averageItemSize
scrollState = scrollState
)

@Composable
Expand Down
2 changes: 1 addition & 1 deletion examples/todoapp/gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion examples/web-compose-bird/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension

plugins {
kotlin("multiplatform") version "1.5.31"
id("org.jetbrains.compose") version "1.0.0-beta1"
id("org.jetbrains.compose") version "1.0.0-beta5"
}
group = "com.theapache64.composebird"
version = "1.0.0-alpha01"
Expand Down
2 changes: 1 addition & 1 deletion examples/web-landing/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension

plugins {
kotlin("multiplatform") version "1.5.31"
id("org.jetbrains.compose") version "0.0.0-master-build413"
id("org.jetbrains.compose") version "1.0.0-beta5"
}

repositories {
Expand Down
2 changes: 1 addition & 1 deletion examples/web-landing/gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion examples/web-with-react/build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
plugins {
kotlin("multiplatform") version "1.5.31"
id("org.jetbrains.compose") version "0.0.0-master-build413"
id("org.jetbrains.compose") version "1.0.0-beta5"
}

repositories {
Expand Down
2 changes: 1 addition & 1 deletion examples/widgets-gallery/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {

dependencies {
// __LATEST_COMPOSE_RELEASE_VERSION__
classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-beta1")
classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-beta5")
classpath("com.android.tools.build:gradle:4.2.0")
// __KOTLIN_COMPOSE_VERSION__
classpath(kotlin("gradle-plugin", version = "1.5.31"))
Expand Down

0 comments on commit 01530c0

Please sign in to comment.