Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make compose.html support kotlin 1.8.20 #3029

Merged
merged 2 commits into from
Apr 11, 2023
Merged

Make compose.html support kotlin 1.8.20 #3029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00341e9
Support kotlin 1.8.20 in compose.html lib
eymar Apr 11, 2023
1777d00
Merge remote-tracking branch 'origin/support/1.4.0' into compose-html…
eymar Apr 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion html/buildSrc/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
kotlin.version=1.8.10
kotlin.version=1.8.20
2 changes: 1 addition & 1 deletion html/buildSrc/src/main/kotlin/SeleniumDriverPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
import java.io.File
import java.net.URL

private val CHROME_DRIVER_VERSION = "108.0.5359.71"
private val CHROME_DRIVER_VERSION = "112.0.5615.49"
private val GECKO_DRIVER_VERSION = "0.31.0"

private fun download(url: String, file: File) {
Expand Down
0 ...ng/CompanionGetValueOperatorComposable.kt → ...ng/CompanionGetValueOperatorComposable.kt
View file
Open in desktop
File renamed without changes.
0 ...ing/InstanceGetValueOperatorComposable.kt → ...ing/InstanceGetValueOperatorComposable.kt
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions html/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
compose.version=1.3.1
compose.version=1.4.0-rc03
compose.web.buildSamples=false
compose.web.tests.integration.withFirefox
compose.web.tests.skip.benchmarks=false
org.gradle.jvmargs=-Xmx8g
org.gradle.jvmargs=-Xmx8g
293 changes: 270 additions & 23 deletions html/kotlin-js-store/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions html/test-utils/conf/karma-kotlin-runner-decorator/karma-kotlin-reporter-decorated.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ const NewReporter = function(baseReporterDecorator, config, emitter) {

const path = require('path');
const fs = require('fs');
const kotlinVersion = fs.readFileSync(path.resolve(__dirname, "../../../buildSrc/build/kotlin.version"), 'utf8');
// const kotlinVersion = fs.readFileSync(path.resolve(__dirname, "../../../buildSrc/build/kotlin.version"), 'utf8');

const kotlinReporterModule = require(`../../../build/js/packages_imported/kotlin-test-js-runner/${kotlinVersion}/karma-kotlin-reporter`);
const kotlinReporterModule = require(`../../../build/js/node_modules/kotlin-test-js-runner/karma-kotlin-reporter`);
const KotlinReporter = kotlinReporterModule['reporter:karma-kotlin-reporter'][1];
this.$inject = KotlinReporter.$inject

Expand Down