Browse Source

Move to dev97

pull/24/head
Nikolay Igotti 4 years ago
parent
commit
c0c31e9506
  1. 4
      examples/imageviewer/common/src/desktopMain/kotlin/example/imageviewer/utils/GraphicsMath.kt
  2. 2
      examples/imageviewer/settings.gradle.kts
  3. 2
      examples/issues/settings.gradle.kts
  4. 2
      templates/desktop-template/build.gradle.kts
  5. 2
      templates/multiplatform-template/settings.gradle.kts

4
examples/imageviewer/common/src/desktopMain/kotlin/example/imageviewer/utils/GraphicsMath.kt

@ -124,7 +124,7 @@ fun applyBlurFilter(bitmap: BufferedImage): BufferedImage {
} }
fun displayWidth(): Int { fun displayWidth(): Int {
val window = AppManager.getCurrentFocusedWindow() val window = AppManager.focusedWindow
if (window != null) { if (window != null) {
return window.width return window.width
} }
@ -132,7 +132,7 @@ fun displayWidth(): Int {
} }
fun displayHeight(): Int { fun displayHeight(): Int {
val window = AppManager.getCurrentFocusedWindow() val window = AppManager.focusedWindow
if (window != null) { if (window != null) {
return window.height return window.height
} }

2
examples/imageviewer/settings.gradle.kts

@ -6,7 +6,7 @@ buildscript {
} }
dependencies { dependencies {
classpath("org.jetbrains.compose:compose-gradle-plugin:0.1.0-dev87") classpath("org.jetbrains.compose:compose-gradle-plugin:0.1.0-dev97")
classpath("com.android.tools.build:gradle:4.0.1") classpath("com.android.tools.build:gradle:4.0.1")
classpath(kotlin("gradle-plugin", version = "1.4.0")) classpath(kotlin("gradle-plugin", version = "1.4.0"))
} }

2
examples/issues/settings.gradle.kts

@ -6,7 +6,7 @@ buildscript {
} }
dependencies { dependencies {
classpath("org.jetbrains.compose:compose-gradle-plugin:0.1.0-dev87") classpath("org.jetbrains.compose:compose-gradle-plugin:0.1.0-dev97")
classpath("com.android.tools.build:gradle:4.0.1") classpath("com.android.tools.build:gradle:4.0.1")
classpath(kotlin("gradle-plugin", version = "1.4.0")) classpath(kotlin("gradle-plugin", version = "1.4.0"))
} }

2
templates/desktop-template/build.gradle.kts

@ -2,7 +2,7 @@ import org.jetbrains.compose.compose
plugins { plugins {
kotlin("jvm") version "1.4.0" kotlin("jvm") version "1.4.0"
id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.1.0-dev87") id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.1.0-dev97")
application application
} }

2
templates/multiplatform-template/settings.gradle.kts

@ -1,5 +1,5 @@
buildscript { buildscript {
val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.1.0-dev87" val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.1.0-dev97"
repositories { repositories {
google() google()

Loading…
Cancel
Save