Skip to content

Enhancement: Update to latest compose #9

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
warwickhunter wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Enhancement: Update to latest compose #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7af6f8b
Update to gradle 8.5 to promote compatibility with Android Studio Otter
rivercartwright Nov 21, 2025
98486b5
Update to gradle 8.13 and set compile and target sdk to 36 to exceed …
rivercartwright Nov 21, 2025
7b52ff1
Update to gradle 8.14.3
rivercartwright Nov 21, 2025
037095b
Update to use Compose BOM 2024.11.00
rivercartwright Nov 21, 2025
bd198fe
Update to use Compose BOM 2025.11.01 and make the necessary adjustmen…
rivercartwright Nov 21, 2025
b13b832
Update to Kotlin 2.2.12 and Java 17. Add the compose compiler plugin …
rivercartwright Nov 21, 2025
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
51 changes: 29 additions & 22 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
id 'com.android.application'
id 'org.jetbrains.kotlin.android'
id 'org.jetbrains.kotlin.plugin.compose'
}

android {
namespace 'com.kevinnzou.compose.composeswipebox'
compileSdk 34
compileSdk = 36

defaultConfig {
applicationId "com.kevinnzou.compose.composeswipebox"
minSdk 21
targetSdk 32
minSdk 23
targetSdk 36
versionCode 1
versionName "1.0"

Expand All @@ -27,18 +30,17 @@ android {
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = '1.8'
kotlin {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_17)
}
}
buildFeatures {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion compose_compiler_version
}
packagingOptions {
resources {
excludes += '/META-INF/{AL2.0,LGPL2.1}'
Expand All @@ -47,20 +49,25 @@ android {
}

dependencies {
implementation "androidx.compose.ui:ui:$compose_version"
implementation "androidx.compose.foundation:foundation:$compose_version"
implementation "androidx.compose.material:material:$compose_version"
implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
implementation 'androidx.activity:activity-compose:1.6.0'
// Compose BOM
implementation platform("androidx.compose:compose-bom:$compose_bom_version")
androidTestImplementation platform("androidx.compose:compose-bom:$compose_bom_version")
debugImplementation platform("androidx.compose:compose-bom:$compose_bom_version")

implementation "androidx.compose.ui:ui"
implementation "androidx.compose.foundation:foundation"
implementation "androidx.compose.material:material"
implementation "androidx.compose.material:material-icons-extended"
implementation "androidx.compose.ui:ui-tooling-preview"
implementation 'androidx.activity:activity-compose:1.12.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version"
androidTestImplementation 'androidx.test.ext:junit:1.3.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'
androidTestImplementation "androidx.compose.ui:ui-test-junit4"
debugImplementation "androidx.compose.ui:ui-tooling"
debugImplementation "androidx.compose.ui:ui-test-manifest"
implementation project(':swipebox')

def nav_version = "2.5.3"

def nav_version = "2.9.6"
implementation "androidx.navigation:navigation-compose:$nav_version"
}
15 changes: 8 additions & 7 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
buildscript {
ext {
compose_version = '1.6.0'
compose_compiler_version = '1.5.8'
compose_bom_version = '2025.11.01'
}
}// Top-level build file where you can add configuration options common to all sub-projects/modules.
}
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id 'com.android.application' version '8.1.1' apply false
id 'com.android.library' version '8.1.1' apply false
id 'org.jetbrains.kotlin.android' version '1.9.22' apply false
id 'org.jetbrains.kotlin.jvm' version '1.9.22' apply false
id 'com.android.application' version '8.13.1' apply false
id 'com.android.library' version '8.13.1' apply false
id 'org.jetbrains.kotlin.android' version '2.2.21' apply false
id 'org.jetbrains.kotlin.jvm' version '2.2.21' apply false
id 'org.jetbrains.kotlin.plugin.compose' version '2.2.21' apply false
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
7 changes: 4 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#Mon Dec 26 16:47:28 CST 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading