Skip to content

Commit

Permalink
Some dependency updates
Browse files Browse the repository at this point in the history
  • Loading branch information
erikeelde committed Sep 8, 2024
1 parent 9f999b8 commit 62fdeb0
Show file tree
Hide file tree
Showing 15 changed files with 24 additions and 81 deletions.
2 changes: 2 additions & 0 deletions build-logic/conventions/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ dependencies {
implementation(libs.org.jetbrains.kotlin.kotlin.gradle.plugin)
implementation(libs.com.google.devtools.ksp.com.google.devtools.ksp.gradle.plugin)
implementation(libs.com.squareup.kotlinpoet)
implementation(libs.org.jetbrains.kotlin.compose.compiler.gradle.plugin)

// https://github.com/gradle/gradle/issues/15383
implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,19 @@ plugins {
kotlin("android")
id("kotlin-android")
id("toggles.detekt-conventions")
id("org.jetbrains.kotlin.plugin.compose")
}

android {
compileSdk = 34
compileSdk = 35

defaultConfig {
minSdk = 21
targetSdk = 34
targetSdk = 35

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}

buildFeatures {
compose = true
}

composeOptions {
kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
}

lint {
baseline = file("lint-baseline.xml")
checkReleaseBuilds = true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
import gradle.kotlin.dsl.accessors._2c8cd94a371784cae42f67a4fea566f3.androidTestImplementation
import gradle.kotlin.dsl.accessors._2c8cd94a371784cae42f67a4fea566f3.androidTestUtil
import gradle.kotlin.dsl.accessors._2c8cd94a371784cae42f67a4fea566f3.testImplementation
import org.gradle.accessors.dm.LibrariesForLibs
import org.gradle.kotlin.dsl.kotlin

Expand Down
14 changes: 8 additions & 6 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
[versions]
agp = "8.4.0"
agp = "8.6.0"
androidx-activity = "1.7.1"
androidx-appcompat = "1.6.1"
androidx-arch-core = "2.2.0"
androidx-compose-bom = "2024.05.00"
androidx-compose-compiler = "1.5.13"
androidx-hilt = "1.2.0"
androidx-lifecycle = "2.7.0"
androidx-navigation = "2.7.7"
androidx-room = "2.6.1"
androidx-test = "1.5.0"
ksp = "1.9.23-1.0.20"
com-google-dagger = "2.51.1"
ksp = "2.0.20-1.0.25"
com-google-dagger = "2.52"
com-squareup-leakcanary = "2.14"
com-squareup-moshi = "1.15.1"
dokka = "1.9.0"
espresso-core = "3.5.1"
junit = "4.13.2"
kotlin = "1.9.23"
kotlin = "2.0.20"
orchestrator = "1.4.2"
org-jetbrains-kotlinx = "1.6.4"

Expand All @@ -39,6 +38,7 @@ androidx-compose-ui-ui-text = { module = "androidx.compose.ui:ui-text" }
androidx-compose-ui-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
androidx-compose-ui-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
androidx-core-core-ktx = "androidx.core:core-ktx:1.9.0"
org-jetbrains-kotlin-compose-compiler-gradle-plugin = { module = "org.jetbrains.kotlin:compose-compiler-gradle-plugin", version.ref = "kotlin" }
androidx-hilt-hilt-compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "androidx-hilt" }
androidx-hilt-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version = "1.2.0" }
androidx-lifecycle-lifecycle-common-java8 = { module = "androidx.lifecycle:lifecycle-common-java8", version.ref = "androidx-lifecycle" }
Expand Down Expand Up @@ -70,7 +70,7 @@ com-google-dagger-hilt-android-compiler = { module = "com.google.dagger:hilt-and
com-google-dagger-hilt-android-gradle-plugin = { module = "com.google.dagger:hilt-android-gradle-plugin", version.ref = "com-google-dagger" }
com-google-dagger-hilt-android-testing = { module = "com.google.dagger:hilt-android-testing", version.ref = "com-google-dagger" }
com-google-dagger-hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "com-google-dagger" }
com-google-devtools-ksp-com-google-devtools-ksp-gradle-plugin = { module = "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin", version.ref="ksp" }
com-google-devtools-ksp-com-google-devtools-ksp-gradle-plugin = { module = "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin", version.ref = "ksp" }
com-google-gms-google-services = "com.google.gms:google-services:4.4.1"
com-slack-lint-compose-compose-lint-checks = "com.slack.lint.compose:compose-lint-checks:1.3.1"
com-squareup-kotlinpoet = "com.squareup:kotlinpoet:1.16.0"
Expand All @@ -95,7 +95,9 @@ se-eelde-toggles-toggles-core = "se.eelde.toggles:toggles-core:0.0.2"
se-eelde-toggles-toggles-flow = "se.eelde.toggles:toggles-flow:0.0.1"
se-eelde-toggles-toggles-prefs = "se.eelde.toggles:toggles-prefs:0.0.1"
se-premex-ownership-gradle-plugin = "se.premex:ownership-gradle-plugin:0.0.11"

[plugins]
org-jetbrains-kotlin-plugin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
com-android-library = { id = "com.android.library", version.ref = "agp" }
com-autonomousapps-dependency-analysis = "com.autonomousapps.dependency-analysis:1.31.0"
com-github-ben-manes-versions = "com.github.ben-manes.versions:0.51.0"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
7 changes: 1 addition & 6 deletions modules/applications/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,11 @@ plugins {
id("toggles.android.module-conventions")
id("toggles.ownership-conventions")
alias(libs.plugins.com.google.devtools.ksp)
id("org.jetbrains.kotlin.plugin.compose")
}

android {
namespace = "se.eelde.toggles.applications"
buildFeatures {
compose = true
}
composeOptions {
kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
}
}

dependencies {
Expand Down
7 changes: 1 addition & 6 deletions modules/booleanconfiguration/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,11 @@ plugins {
id("toggles.android.module-conventions")
id("toggles.ownership-conventions")
alias(libs.plugins.com.google.devtools.ksp)
id("org.jetbrains.kotlin.plugin.compose")
}

android {
namespace = "se.eelde.toggles.booleanconfiguration"
buildFeatures {
compose = true
}
composeOptions {
kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
}
}

dependencies {
Expand Down
7 changes: 1 addition & 6 deletions modules/compose-theme/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
plugins {
id("toggles.android.module-conventions")
id("toggles.ownership-conventions")
id("org.jetbrains.kotlin.plugin.compose")
}

android {
namespace = "se.eelde.toggles.composetheme"
buildFeatures {
compose = true
}
composeOptions {
kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
}
}
dependencies {
implementation(platform(libs.androidx.compose.bom))
Expand Down
7 changes: 1 addition & 6 deletions modules/configurations/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,11 @@ plugins {
id("toggles.android.module-conventions")
id("toggles.ownership-conventions")
alias(libs.plugins.com.google.devtools.ksp)
id("org.jetbrains.kotlin.plugin.compose")
}

android {
namespace = "se.eelde.toggles.configurations"
buildFeatures {
compose = true
}
composeOptions {
kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
}
}

dependencies {
Expand Down
7 changes: 1 addition & 6 deletions modules/enumconfiguration/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,11 @@ plugins {
id("toggles.android.module-conventions")
id("toggles.ownership-conventions")
alias(libs.plugins.com.google.devtools.ksp)
id("org.jetbrains.kotlin.plugin.compose")
}

android {
namespace = "se.eelde.toggles.enumconfiguration"
buildFeatures {
compose = true
}
composeOptions {
kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
}
}

dependencies {
Expand Down
7 changes: 1 addition & 6 deletions modules/help/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,11 @@ plugins {
id("toggles.android.module-conventions")
id("toggles.ownership-conventions")
alias(libs.plugins.com.google.devtools.ksp)
id("org.jetbrains.kotlin.plugin.compose")
}

android {
namespace = "se.eelde.toggles.help"
buildFeatures {
compose = true
}
composeOptions {
kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
}
}

dependencies {
Expand Down
7 changes: 1 addition & 6 deletions modules/integerconfiguration/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,11 @@ plugins {
id("toggles.android.module-conventions")
id("toggles.ownership-conventions")
alias(libs.plugins.com.google.devtools.ksp)
id("org.jetbrains.kotlin.plugin.compose")
}

android {
namespace = "se.eelde.toggles.integerconfiguration"
buildFeatures {
compose = true
}
composeOptions {
kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
}
}

dependencies {
Expand Down
7 changes: 1 addition & 6 deletions modules/oss/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,11 @@ plugins {
id("toggles.android.module-conventions")
id("toggles.ownership-conventions")
alias(libs.plugins.com.google.devtools.ksp)
id("org.jetbrains.kotlin.plugin.compose")
}

android {
namespace = "se.eelde.toggles.oss"
buildFeatures {
compose = true
}
composeOptions {
kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
}
}

dependencies {
Expand Down
8 changes: 1 addition & 7 deletions modules/provider/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,11 @@ plugins {
id("toggles.android.module-conventions")
id("toggles.ownership-conventions")
alias(libs.plugins.com.google.devtools.ksp)
id("org.jetbrains.kotlin.plugin.compose")
}

android {
namespace = "se.eelde.toggles.provider"
buildFeatures {

compose = true
}
composeOptions {
kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
}
}

dependencies {
Expand Down
7 changes: 1 addition & 6 deletions modules/stringconfiguration/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,11 @@ plugins {
id("toggles.android.module-conventions")
id("toggles.ownership-conventions")
alias(libs.plugins.com.google.devtools.ksp)
id("org.jetbrains.kotlin.plugin.compose")
}

android {
namespace = "se.eelde.toggles.stringconfiguration"
buildFeatures {
compose = true
}
composeOptions {
kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
}
}

dependencies {
Expand Down

0 comments on commit 62fdeb0

Please sign in to comment.