From c8812bd04b742b3551a77dbd0aa8dad5ebb76711 Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Mon, 26 Oct 2020 19:26:37 +0300 Subject: [PATCH 1/3] Unify .gitignore across all examples and templates --- examples/imageviewer/.gitignore | 16 ++- examples/issues/.gitignore | 20 ++-- examples/todoapp/.gitignore | 2 +- examples/todoapp/android/.gitignore | 1 - examples/todoapp/buildSrc/.gitignore | 1 - examples/todoapp/buildSrc/buildSrc/.gitignore | 1 - examples/todoapp/common/database/.gitignore | 1 - examples/todoapp/common/edit/.gitignore | 1 - examples/todoapp/common/main/.gitignore | 1 - examples/todoapp/common/root/.gitignore | 1 - examples/todoapp/common/utils/.gitignore | 1 - examples/todoapp/desktop/.gitignore | 1 - templates/desktop-template/.gitignore | 99 +++---------------- templates/multiplatform-template/.gitignore | 99 +++---------------- 14 files changed, 55 insertions(+), 190 deletions(-) delete mode 100644 examples/todoapp/android/.gitignore delete mode 100644 examples/todoapp/buildSrc/.gitignore delete mode 100644 examples/todoapp/buildSrc/buildSrc/.gitignore delete mode 100644 examples/todoapp/common/database/.gitignore delete mode 100644 examples/todoapp/common/edit/.gitignore delete mode 100644 examples/todoapp/common/main/.gitignore delete mode 100644 examples/todoapp/common/root/.gitignore delete mode 100644 examples/todoapp/common/utils/.gitignore delete mode 100644 examples/todoapp/desktop/.gitignore diff --git a/examples/imageviewer/.gitignore b/examples/imageviewer/.gitignore index 3603efad10..a32b16597b 100644 --- a/examples/imageviewer/.gitignore +++ b/examples/imageviewer/.gitignore @@ -1,3 +1,15 @@ -.DS_Store +*.iml .gradle -build \ No newline at end of file +/local.properties +/.idea +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +build/ +/captures +.externalNativeBuild +.cxx diff --git a/examples/issues/.gitignore b/examples/issues/.gitignore index fba68bf46c..a32b16597b 100644 --- a/examples/issues/.gitignore +++ b/examples/issues/.gitignore @@ -1,7 +1,15 @@ -/desktop/build -/android/build -/common/build -/.gradle +*.iml +.gradle +/local.properties /.idea - -.DS_Store \ No newline at end of file +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +build/ +/captures +.externalNativeBuild +.cxx diff --git a/examples/todoapp/.gitignore b/examples/todoapp/.gitignore index 6f6d9f7613..a32b16597b 100644 --- a/examples/todoapp/.gitignore +++ b/examples/todoapp/.gitignore @@ -9,7 +9,7 @@ /.idea/navEditor.xml /.idea/assetWizardSettings.xml .DS_Store -/build +build/ /captures .externalNativeBuild .cxx diff --git a/examples/todoapp/android/.gitignore b/examples/todoapp/android/.gitignore deleted file mode 100644 index 796b96d1c4..0000000000 --- a/examples/todoapp/android/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/examples/todoapp/buildSrc/.gitignore b/examples/todoapp/buildSrc/.gitignore deleted file mode 100644 index 796b96d1c4..0000000000 --- a/examples/todoapp/buildSrc/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/examples/todoapp/buildSrc/buildSrc/.gitignore b/examples/todoapp/buildSrc/buildSrc/.gitignore deleted file mode 100644 index 796b96d1c4..0000000000 --- a/examples/todoapp/buildSrc/buildSrc/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/examples/todoapp/common/database/.gitignore b/examples/todoapp/common/database/.gitignore deleted file mode 100644 index 796b96d1c4..0000000000 --- a/examples/todoapp/common/database/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/examples/todoapp/common/edit/.gitignore b/examples/todoapp/common/edit/.gitignore deleted file mode 100644 index 796b96d1c4..0000000000 --- a/examples/todoapp/common/edit/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/examples/todoapp/common/main/.gitignore b/examples/todoapp/common/main/.gitignore deleted file mode 100644 index 796b96d1c4..0000000000 --- a/examples/todoapp/common/main/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/examples/todoapp/common/root/.gitignore b/examples/todoapp/common/root/.gitignore deleted file mode 100644 index 796b96d1c4..0000000000 --- a/examples/todoapp/common/root/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/examples/todoapp/common/utils/.gitignore b/examples/todoapp/common/utils/.gitignore deleted file mode 100644 index 796b96d1c4..0000000000 --- a/examples/todoapp/common/utils/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/examples/todoapp/desktop/.gitignore b/examples/todoapp/desktop/.gitignore deleted file mode 100644 index 796b96d1c4..0000000000 --- a/examples/todoapp/desktop/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/templates/desktop-template/.gitignore b/templates/desktop-template/.gitignore index 81b4fd153d..a32b16597b 100644 --- a/templates/desktop-template/.gitignore +++ b/templates/desktop-template/.gitignore @@ -1,88 +1,15 @@ -# Built application files -*.apk -*.aar -*.ap_ -*.aab - -# Files for the ART/Dalvik VM -*.dex - -# Java class files -*.class - -# Generated files -bin/ -gen/ -out/ -# Uncomment the following line in case you need and you don't have the release build type files in your app -# release/ - -# Gradle files -.gradle/ -build/ - -# Local configuration file (sdk path, etc) -local.properties - -# Proguard folder generated by Eclipse -proguard/ - -# Log Files -*.log - -# Android Studio Navigation editor temp files -.navigation/ - -# Android Studio captures folder -captures/ - -# IntelliJ *.iml -.idea/workspace.xml -.idea/tasks.xml -.idea/gradle.xml -.idea/assetWizardSettings.xml -.idea/dictionaries -.idea/libraries -# Android Studio 3 in .gitignore file. -.idea/caches -.idea/modules.xml -# Comment next line if keeping position of elements in Navigation Editor is relevant for you -.idea/navEditor.xml - -# Keystore files -# Uncomment the following lines if you do not want to check your keystore files in. -#*.jks -#*.keystore - -# External native build folder generated in Android Studio 2.2 and later +.gradle +/local.properties +/.idea +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +build/ +/captures .externalNativeBuild -.cxx/ - -# Google Services (e.g. APIs or Firebase) -# google-services.json - -# Freeline -freeline.py -freeline/ -freeline_project_description.json - -# fastlane -fastlane/report.xml -fastlane/Preview.html -fastlane/screenshots -fastlane/test_output -fastlane/readme.md - -# Version control -vcs.xml - -# lint -lint/intermediates/ -lint/generated/ -lint/outputs/ -lint/tmp/ -# lint/reports/ - -# Android Profiling -*.hprof \ No newline at end of file +.cxx diff --git a/templates/multiplatform-template/.gitignore b/templates/multiplatform-template/.gitignore index 81b4fd153d..a32b16597b 100644 --- a/templates/multiplatform-template/.gitignore +++ b/templates/multiplatform-template/.gitignore @@ -1,88 +1,15 @@ -# Built application files -*.apk -*.aar -*.ap_ -*.aab - -# Files for the ART/Dalvik VM -*.dex - -# Java class files -*.class - -# Generated files -bin/ -gen/ -out/ -# Uncomment the following line in case you need and you don't have the release build type files in your app -# release/ - -# Gradle files -.gradle/ -build/ - -# Local configuration file (sdk path, etc) -local.properties - -# Proguard folder generated by Eclipse -proguard/ - -# Log Files -*.log - -# Android Studio Navigation editor temp files -.navigation/ - -# Android Studio captures folder -captures/ - -# IntelliJ *.iml -.idea/workspace.xml -.idea/tasks.xml -.idea/gradle.xml -.idea/assetWizardSettings.xml -.idea/dictionaries -.idea/libraries -# Android Studio 3 in .gitignore file. -.idea/caches -.idea/modules.xml -# Comment next line if keeping position of elements in Navigation Editor is relevant for you -.idea/navEditor.xml - -# Keystore files -# Uncomment the following lines if you do not want to check your keystore files in. -#*.jks -#*.keystore - -# External native build folder generated in Android Studio 2.2 and later +.gradle +/local.properties +/.idea +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +build/ +/captures .externalNativeBuild -.cxx/ - -# Google Services (e.g. APIs or Firebase) -# google-services.json - -# Freeline -freeline.py -freeline/ -freeline_project_description.json - -# fastlane -fastlane/report.xml -fastlane/Preview.html -fastlane/screenshots -fastlane/test_output -fastlane/readme.md - -# Version control -vcs.xml - -# lint -lint/intermediates/ -lint/generated/ -lint/outputs/ -lint/tmp/ -# lint/reports/ - -# Android Profiling -*.hprof \ No newline at end of file +.cxx From 3876014768b316f47e138207b8dea7fd65eb5b81 Mon Sep 17 00:00:00 2001 From: Nikolay Igotti Date: Mon, 26 Oct 2020 20:36:03 +0300 Subject: [PATCH 2/3] Move to compose.desktop.currentOs --- cef/build.gradle.kts | 2 +- examples/imageviewer/desktop/build.gradle.kts | 2 +- examples/issues/desktop/build.gradle.kts | 2 +- examples/todoapp/desktop/build.gradle.kts | 2 +- templates/desktop-template/build.gradle.kts | 2 +- templates/multiplatform-template/desktop/build.gradle.kts | 4 ++-- tutorials/Getting_Started/main.md | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cef/build.gradle.kts b/cef/build.gradle.kts index 8419c2ec69..ac6730ba2f 100644 --- a/cef/build.gradle.kts +++ b/cef/build.gradle.kts @@ -47,7 +47,7 @@ repositories { dependencies { implementation("org.jetbrains.jcef:jcef-skiko:0.1") - implementation(compose.desktop.all) + implementation(compose.desktop.currentOs) } tasks.withType().configureEach { diff --git a/examples/imageviewer/desktop/build.gradle.kts b/examples/imageviewer/desktop/build.gradle.kts index 981c3132df..4346cbfed2 100755 --- a/examples/imageviewer/desktop/build.gradle.kts +++ b/examples/imageviewer/desktop/build.gradle.kts @@ -8,7 +8,7 @@ plugins { } dependencies { - implementation(compose.desktop.all) + implementation(compose.desktop.currentOs) implementation(project(":common")) } diff --git a/examples/issues/desktop/build.gradle.kts b/examples/issues/desktop/build.gradle.kts index be3c5edc90..f89894125d 100644 --- a/examples/issues/desktop/build.gradle.kts +++ b/examples/issues/desktop/build.gradle.kts @@ -8,7 +8,7 @@ plugins { } dependencies { - implementation(compose.desktop.all) + implementation(compose.desktop.currentOs) implementation(project(":common")) } diff --git a/examples/todoapp/desktop/build.gradle.kts b/examples/todoapp/desktop/build.gradle.kts index 425c749221..a7ec46c63c 100755 --- a/examples/todoapp/desktop/build.gradle.kts +++ b/examples/todoapp/desktop/build.gradle.kts @@ -8,7 +8,7 @@ plugins { } dependencies { - implementation(compose.desktop.all) + implementation(compose.desktop.currentOs) implementation(project(":common:utils")) implementation(project(":common:database")) implementation(project(":common:root")) diff --git a/templates/desktop-template/build.gradle.kts b/templates/desktop-template/build.gradle.kts index 6a34e3c4f5..a99f34e900 100644 --- a/templates/desktop-template/build.gradle.kts +++ b/templates/desktop-template/build.gradle.kts @@ -12,7 +12,7 @@ repositories { } dependencies { - implementation(compose.desktop.all) + implementation(compose.desktop.currentOs) } application { diff --git a/templates/multiplatform-template/desktop/build.gradle.kts b/templates/multiplatform-template/desktop/build.gradle.kts index 89af4eb8d8..c7ee1bab94 100644 --- a/templates/multiplatform-template/desktop/build.gradle.kts +++ b/templates/multiplatform-template/desktop/build.gradle.kts @@ -8,10 +8,10 @@ plugins { } dependencies { - implementation(compose.desktop.all) + implementation(compose.desktop.currentOs) implementation(project(":common")) } application { mainClassName = "MainKt" -} \ No newline at end of file +} diff --git a/tutorials/Getting_Started/main.md b/tutorials/Getting_Started/main.md index e24c7700d0..fe4ca1f996 100644 --- a/tutorials/Getting_Started/main.md +++ b/tutorials/Getting_Started/main.md @@ -52,7 +52,7 @@ repositories { } dependencies { - implementation(compose.desktop.all) + implementation(compose.desktop.currentOs) } application { From 765c1fd86ded54978a11455695b11f0f12073204 Mon Sep 17 00:00:00 2001 From: Nikolay Igotti Date: Mon, 26 Oct 2020 21:29:13 +0300 Subject: [PATCH 3/3] CEF to dev97 --- cef/build.gradle.kts | 4 +++- cef/settings.gradle.kts | 2 +- cef/src/main/kotlin/org/jetbrains/compose/desktop/App.kt | 1 - .../org/jetbrains/compose/desktop/browser/BrowserState.kt | 4 ++-- .../kotlin/org/jetbrains/compose/desktop/browser/CefView.kt | 6 +++--- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/cef/build.gradle.kts b/cef/build.gradle.kts index ac6730ba2f..0f432736ab 100644 --- a/cef/build.gradle.kts +++ b/cef/build.gradle.kts @@ -5,7 +5,7 @@ import kotlin.text.capitalize plugins { kotlin("jvm") version "1.4.0" - id("org.jetbrains.compose") version "0.1.0-unmerged30" + id("org.jetbrains.compose") version "0.1.0-dev97" id("de.undercouch.download") version "4.1.1" application } @@ -42,6 +42,8 @@ val cefUnZip = run { repositories { google() jcenter() + maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") + // temp maven("https://packages.jetbrains.team/maven/p/ui/dev") } diff --git a/cef/settings.gradle.kts b/cef/settings.gradle.kts index e7f00ef208..ad4365a737 100644 --- a/cef/settings.gradle.kts +++ b/cef/settings.gradle.kts @@ -1,7 +1,7 @@ pluginManagement { repositories { gradlePluginPortal() - maven("https://packages.jetbrains.team/maven/p/ui/dev") + maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") } } diff --git a/cef/src/main/kotlin/org/jetbrains/compose/desktop/App.kt b/cef/src/main/kotlin/org/jetbrains/compose/desktop/App.kt index 3e0d30e296..57aed65bdb 100644 --- a/cef/src/main/kotlin/org/jetbrains/compose/desktop/App.kt +++ b/cef/src/main/kotlin/org/jetbrains/compose/desktop/App.kt @@ -65,7 +65,6 @@ private fun AddressBar() { ) Spacer(Modifier.width(10.dp)) Button( - backgroundColor = Color(16, 180, 140), modifier = Modifier.preferredHeight(48.dp), shape = CircleShape, onClick = { BrowserState.loadURL(BrowserState.url.value) } diff --git a/cef/src/main/kotlin/org/jetbrains/compose/desktop/browser/BrowserState.kt b/cef/src/main/kotlin/org/jetbrains/compose/desktop/browser/BrowserState.kt index 8b9ffaa2dc..32558fdd1f 100644 --- a/cef/src/main/kotlin/org/jetbrains/compose/desktop/browser/BrowserState.kt +++ b/cef/src/main/kotlin/org/jetbrains/compose/desktop/browser/BrowserState.kt @@ -25,7 +25,7 @@ object BrowserState { fun loadURL(url: String) { if (!isReady.value) { - val app = AppManager.getCurrentFocusedWindow() + val app = AppManager.focusedWindow if (app != null) { init(app, url) } @@ -86,4 +86,4 @@ object BrowserState { } return null } -} \ No newline at end of file +} diff --git a/cef/src/main/kotlin/org/jetbrains/compose/desktop/browser/CefView.kt b/cef/src/main/kotlin/org/jetbrains/compose/desktop/browser/CefView.kt index 5c2809f937..546531a269 100644 --- a/cef/src/main/kotlin/org/jetbrains/compose/desktop/browser/CefView.kt +++ b/cef/src/main/kotlin/org/jetbrains/compose/desktop/browser/CefView.kt @@ -19,7 +19,7 @@ import androidx.compose.ui.Modifier import org.jetbrains.skija.IRect import org.jetbrains.skija.Bitmap -import androidx.compose.ui.graphics.drawscope.drawCanvas +import androidx.compose.ui.graphics.drawscope.drawIntoCanvas import androidx.compose.ui.graphics.nativeCanvas import androidx.compose.runtime.getValue @@ -87,7 +87,7 @@ fun CefCanvas(bitmap: Bitmap, browser: BrowserState) { .focus() .clickable(indication = null) { focusRequester.requestFocus() } ) { - drawCanvas { canvas, size -> + drawIntoCanvas { canvas -> canvas.nativeCanvas.drawBitmapRect(bitmap, IRect(0, 0, width.value, height.value).toRect()) } } @@ -103,4 +103,4 @@ private fun Modifier.onResized(browser: BrowserState) = Modifier.layout { measur layout(placeable.width, placeable.height) { placeable.placeRelative(0, 0) } -} \ No newline at end of file +}