Skip to content

Commit

Permalink
Merge pull request #75 from RajashekarRaju/update-project-configuration
Browse files Browse the repository at this point in the history
Move from kapt to ksp, Upgraded kotlin version and build tools
  • Loading branch information
RajashekarRaju authored Dec 21, 2024
2 parents 0cb87ac + 8baf7a3 commit a5ab877
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
plugins {
alias(libs.plugins.com.android.application)
alias(libs.plugins.org.jetbrains.kotlin.android)
alias(libs.plugins.org.jetbrains.kotlin.kapt)
alias(libs.plugins.com.google.dagger.hilt.android)
alias(libs.plugins.com.google.ksp)
id("dagger.hilt.android.plugin")
alias(libs.plugins.com.google.gms)
alias(libs.plugins.com.google.firebase)
alias(libs.plugins.compose.compiler)
Expand Down Expand Up @@ -106,12 +106,13 @@ dependencies {
implementation(libs.androidx.room.room.ktx)
implementation(libs.com.google.firebase.analytics)
implementation(libs.com.google.firebase.crashlytics)
kapt(libs.androidx.room.room.compiler)
ksp(libs.androidx.room.room.compiler)

// hilt
implementation(libs.com.google.dagger.hilt.android)
implementation(libs.androidx.hilt.hilt.navigation.compose)
kapt(libs.com.google.dagger.hilt.android.compiler)
ksp(libs.com.google.dagger.hilt.android.compiler)
ksp(libs.hilt.androidx.compiler)

// Paging
implementation(libs.androidx.paging.paging.compose)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package com.developersbreach.composeactors.ui.components

import androidx.annotation.FloatRange
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableFloatStateOf
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
Expand Down Expand Up @@ -52,7 +53,7 @@ fun Modifier.verticalGradientScrim(
}
}

var height by remember { mutableStateOf(0f) }
var height by remember { mutableFloatStateOf(0f) }
val brush = remember(color, numStops, startYPercentage, endYPercentage, height) {
Brush.verticalGradient(
colors = colors,
Expand Down
9 changes: 7 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
plugins {
alias(libs.plugins.com.android.application) apply false
alias(libs.plugins.org.jetbrains.kotlin.android) apply false
alias(libs.plugins.org.jetbrains.kotlin.kapt) apply false
alias(libs.plugins.com.google.dagger.hilt.android) apply false
alias(libs.plugins.com.google.ksp) apply false
alias(libs.plugins.com.google.gms) apply false
alias(libs.plugins.com.google.firebase) apply false
alias(libs.plugins.com.diffplug.spotless)
Expand All @@ -11,6 +10,12 @@ plugins {
alias(libs.plugins.compose.compiler) apply false
}

buildscript {
dependencies {
classpath(libs.hilt.android.gradle.plugin)
}
}

spotless {
// optional: limit format enforcement to just the files changed by this feature branch
//ratchetFrom 'origin/master'
Expand Down
11 changes: 6 additions & 5 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ androidx-navigation = "2.8.5"
androidx-palette = "1.0.0"
androidx-room = "2.6.1"
androidx-test-ext = "1.2.1"
com-google-dagger = "2.46.1"
com-google-dagger = "2.53.1"
com-google-gms = "4.4.2"
com-google-firebase = "3.0.2"
kotlin = "2.0.0"
kotlin = "2.0.21"
kotlinx-coroutines-core = "1.9.0"
ktor-bom = "3.0.1"

Expand Down Expand Up @@ -39,6 +39,8 @@ androidx-room-room-runtime = { module = "androidx.room:room-runtime", version.re
androidx-test-ext-junit-ktx = { module = "androidx.test.ext:junit-ktx", version.ref = "androidx-test-ext" }
com-google-android-material = "com.google.android.material:material:1.12.0"
com-google-dagger-hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "com-google-dagger" }
hilt-androidx-compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "androidx-hilt" }
hilt-android-gradle-plugin = { module = "com.google.dagger:hilt-android-gradle-plugin", version.ref = "com-google-dagger" }
com-google-dagger-hilt-android-compiler = { module = "com.google.dagger:hilt-android-compiler", version.ref = "com-google-dagger" }
com-google-firebase-analytics = "com.google.firebase:firebase-analytics-ktx:22.1.2"
com-google-firebase-crashlytics = "com.google.firebase:firebase-crashlytics-ktx:19.3.0"
Expand All @@ -55,14 +57,13 @@ ktor-client-serialization = { module = "io.ktor:ktor-client-serialization" }
ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json" }

[plugins]
com-android-application = "com.android.application:8.5.2"
com-android-application = "com.android.application:8.7.3"
com-diffplug-spotless = "com.diffplug.spotless:6.18.0"
com-github-ben-manes-versions = "com.github.ben-manes.versions:0.46.0"
com-google-dagger-hilt-android = "com.google.dagger.hilt.android:2.46.1"
nl-littlerobots-version-catalog-update = "nl.littlerobots.version-catalog-update:0.8.0"
org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
org-jetbrains-kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
com-google-ksp = "com.google.devtools.ksp:2.0.21-1.0.27"
com-google-gms = { id = "com.google.gms.google-services", version.ref = "com-google-gms" }
com-google-firebase = { id = "com.google.firebase.crashlytics", version.ref = "com-google-firebase" }
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.9-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit a5ab877

Please sign in to comment.