Skip to content

Update kotlin - abandoned #523

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Update kotlin - abandoned #523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
274cf6d
Update kotlin
renovate[bot] Dec 3, 2024
0975e67
Removes kotlinCompilerExtensionVersion
JoseAlcerreca Dec 3, 2024
b3182be
Update libs.versions.toml
JoseAlcerreca Dec 3, 2024
498d702
Adds Compose compiler to screenshot testing project
JoseAlcerreca Dec 3, 2024
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
4 changes: 1 addition & 3 deletions ui/PreviewScreenshot/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.jetbrains.kotlin.android)
alias(libs.plugins.screenshot)
alias(libs.plugins.compose.compiler)
}

android {
Expand Down Expand Up @@ -56,9 +57,6 @@ android {
buildFeatures {
compose = true
}
composeOptions {
kotlinCompilerExtensionVersion = "1.5.13"
}

experimentalProperties["android.experimental.enableScreenshotTest"] = true

Expand Down
4 changes: 2 additions & 2 deletions ui/PreviewScreenshot/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
agp = "8.5.0-beta01"
kotlin = "1.9.23"
kotlin = "2.1.0"
coreKtx = "1.13.1"
junit = "4.13.2"
junitVersion = "1.1.5"
Expand Down Expand Up @@ -30,4 +30,4 @@ androidx-material3 = { group = "androidx.compose.material3", name = "material3"
android-application = { id = "com.android.application", version.ref = "agp" }
jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
screenshot = { id = "com.android.compose.screenshot", version.ref = "screenshot"}

compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
2 changes: 1 addition & 1 deletion ui/espresso/AccessibilitySample/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlinVersion = "1.9.22"
ext.kotlinVersion = "2.1.0"
ext.agpVersion = "8.5.0"
repositories {
// Insert local test repo here
Expand Down
2 changes: 1 addition & 1 deletion ui/espresso/BasicSample/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlinVersion = "1.9.22"
ext.kotlinVersion = "2.1.0"
ext.agpVersion = "8.5.0"
repositories {
// Insert local test repo here
Expand Down
2 changes: 1 addition & 1 deletion ui/espresso/EspressoDeviceSample/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlinVersion = "1.9.22"
ext.kotlinVersion = "2.1.0"
ext.agpVersion = "8.5.0"
repositories {
// Insert local test repo here
Expand Down
2 changes: 1 addition & 1 deletion ui/espresso/FragmentScenarioSample/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlinVersion = "1.9.22"
ext.kotlinVersion = "2.1.0"
ext.agpVersion = "8.5.0"
repositories {
google()
Expand Down
2 changes: 1 addition & 1 deletion ui/espresso/ScreenshotSample/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.agpVersion = "8.5.0"
ext.kotlinVersion = "1.9.22"
ext.kotlinVersion = "2.1.0"
ext.androidxCoreVersion = "1.9.0"
ext.buildToolsVersion = "32.0.0"
ext.androidxCompatVersion = "1.5.1"
Expand Down
2 changes: 1 addition & 1 deletion unit/BasicNativeAndroidTest/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.agpVersion = "8.1.1"
ext.kotlinVersion = "1.7.10"
ext.kotlinVersion = "2.1.0"
ext.androidxCoreVersion = "1.9.0"
ext.buildToolsVersion = "32.0.0"
ext.androidxCompatVersion = "1.5.1"
Expand Down
2 changes: 1 addition & 1 deletion unit/BasicSample-kotlinApp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
buildscript {
ext {
kotlinVersion = "1.3.61"
kotlinVersion = "2.1.0"
}
repositories {
google()
Expand Down
Loading