Skip to content

Commit

Permalink
Downgraded Gradle to 8.10
Browse files Browse the repository at this point in the history
Upgraded AGP to 8.7.1
Updated dependencies
  • Loading branch information
Anthonyy232 committed Oct 18, 2024
1 parent b7587e4 commit 3758363
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 21 deletions.
2 changes: 0 additions & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ plugins {
alias(libs.plugins.ksp)
alias(libs.plugins.aboutLibraries)
alias(libs.plugins.kotlinSerialization)
//alias(libs.plugins.baselineProfile)
}

ksp {
Expand Down Expand Up @@ -124,7 +123,6 @@ dependencies {
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.espresso.core)
androidTestImplementation(libs.androidx.ui.test.junit4)
//"baselineProfile"(project(":baselineprofile"))
debugImplementation(libs.androidx.ui.tooling)
debugImplementation(libs.androidx.ui.test.manifest)
implementation(libs.hilt.android)
Expand Down
1 change: 0 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ plugins {
alias(libs.plugins.aboutLibraries) apply false
alias(libs.plugins.kotlinSerialization) apply false
alias(libs.plugins.androidTest) apply false
//alias(libs.plugins.baselineProfile) apply false
}


Expand Down
24 changes: 9 additions & 15 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,24 +1,22 @@
[versions]
androidGradlePlugin = "8.6.0"
#benchmarkMacroJunit4 = "1.3.2"
androidGradlePlugin = "8.7.1"
kotlin = "2.0.21"
hilt = "2.52"
ksp = "2.0.21-1.0.25"
aboutLibraries = "11.2.3"
#baselineProfile = "1.3.2"
accompanistPermissions = "0.36.0"
aboutlibrariesCore = "11.2.3"
activityCompose = "1.9.2"
animation = "1.7.3"
composeBom = "2024.09.03"
activityCompose = "1.9.3"
animation = "1.7.4"
composeBom = "2024.10.00"
coreKtx = "1.13.1"
coreSplashscreen = "1.2.0-alpha02"
datastore = "1.1.1"
datastorePreferences = "1.1.1"
dfc = "1.0.8"
espressoCore = "3.6.1"
filamentAndroid = "1.17.1"
foundation = "1.7.3"
foundation = "1.7.4"
gson = "2.11.0"
documentfile = "1.1.0-alpha01"
hiltAndroid = "2.52"
Expand All @@ -31,17 +29,16 @@ landscapistGlide = "2.4.1"
lazycolumnscrollbar = "2.2.0"
lifecycleRuntimeKtx = "2.8.6"
lottieCompose = "6.5.2"
material = "1.7.3"
material = "1.7.4"
material3 = "1.3.0"
navigationCompose = "2.8.2"
navigationCompose = "2.8.3"
profileinstaller = "1.4.1"
renderscriptIntrinsicsReplacementToolkit = "b6363490c3"
roomRuntime = "2.6.1"
roomCompiler = "2.6.1"
taskerpluginlibrary = "0.4.10"
toolbarCompose = "2.3.5"
ui = "1.7.3"
#uiautomatorVersion = "2.3.0"
ui = "1.7.4"
workRuntimeKtx = "2.10.0-beta01"
zoomable = "2.0.0-beta01"

Expand All @@ -51,7 +48,6 @@ aboutlibraries-core = { module = "com.mikepenz:aboutlibraries-core", version.ref
accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanistPermissions" }
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }
androidx-animation = { module = "androidx.compose.animation:animation", version.ref = "animation" }
#androidx-benchmark-macro-junit4 = { module = "androidx.benchmark:benchmark-macro-junit4", version.ref = "benchmarkMacroJunit4" }
androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "composeBom" }
androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" }
androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "coreSplashscreen" }
Expand Down Expand Up @@ -79,7 +75,6 @@ androidx-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", versi
androidx-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "ui" }
androidx-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "ui" }
androidx-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "ui" }
#androidx-uiautomator = { module = "androidx.test.uiautomator:uiautomator", version.ref = "uiautomatorVersion" }
androidx-work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version.ref = "workRuntimeKtx" }
dfc = { module = "com.lazygeniouz:dfc", version.ref = "dfc" }
filament-android = { module = "com.google.ar.sceneform:filament-android", version.ref = "filamentAndroid" }
Expand All @@ -105,5 +100,4 @@ hiltAndroid = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
aboutLibraries = { id = "com.mikepenz.aboutlibraries.plugin", version.ref = "aboutLibraries" }
kotlinSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
androidTest = { id = "com.android.test", version.ref = "androidGradlePlugin" }
#baselineProfile = { id = "androidx.baselineprofile", version.ref = "baselineProfile" }
androidTest = { id = "com.android.test", version.ref = "androidGradlePlugin" }
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#Thu Oct 17 21:57:08 PDT 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 0 additions & 2 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,3 @@ dependencyResolutionManagement {
}
rootProject.name = "Paperize"
include(":app")

//include(":baselineprofile")

0 comments on commit 3758363

Please sign in to comment.