Skip to content

Commit

Permalink
Compose 1.5.4
Browse files Browse the repository at this point in the history
  • Loading branch information
Foso committed Nov 5, 2023
1 parent 97b0889 commit 460c01e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
12 changes: 7 additions & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'

Expand All @@ -18,11 +20,11 @@ android {
exclude("win32-x86-64/attach_hotspot_windows.dll")
pickFirst("META-INF/licenses/ASM")
}
compileSdkVersion 34
compileSdk 34
defaultConfig {
applicationId "de.jensklingenberg.jetpackcomposeplayground"
minSdkVersion 21
targetSdkVersion 33
targetSdk 34
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down Expand Up @@ -57,7 +59,7 @@ android {
}

subprojects {
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
tasks.withType(KotlinCompile).configureEach {
kotlinOptions {
if (project.findProperty("composeCompilerReports") == "true") {
freeCompilerArgs += [
Expand All @@ -80,7 +82,7 @@ subprojects {
dependencies {

implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "androidx.activity:activity-compose:1.7.2"
implementation "androidx.activity:activity-compose:1.8.0"
implementation "androidx.appcompat:appcompat:1.6.1"
implementation "androidx.compose.animation:animation-core:$compose_version"
implementation "androidx.compose.animation:animation:$compose_version"
Expand All @@ -99,7 +101,7 @@ dependencies {
implementation "androidx.compose.ui:ui:$compose_version"
implementation "androidx.core:core-ktx:1.12.0"
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2'
implementation 'com.google.android.material:material:1.9.0'
implementation 'com.google.android.material:material:1.10.0'
implementation ("androidx.compose.ui:ui-viewbinding:$compose_version")
implementation("androidx.compose.ui:ui-text:$compose_version")
implementation("androidx.compose.ui:ui-util:$compose_version")
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

buildscript {
ext {
compose_version = '1.5.1'
compose_version = '1.5.4'
kotlin_version = "1.9.10"
}
repositories {
Expand All @@ -19,7 +19,7 @@ buildscript {
}
}

task clean(type: Delete) {
tasks.register('clean', Delete) {
delete rootProject.buildDir
}

0 comments on commit 460c01e

Please sign in to comment.