Skip to content

Commit

Permalink
Fix #187. Updated compose and other dependencies to latest version. (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
kasem-sm authored Jul 30, 2022
1 parent fae8d67 commit 0647544
Show file tree
Hide file tree
Showing 20 changed files with 47 additions and 41 deletions.
10 changes: 5 additions & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ android {
}
}
buildFeatures {
kotlinOptions.freeCompilerArgs += "-Xopt-in=androidx.compose.material3.ExperimentalMaterial3Api"
kotlinOptions.freeCompilerArgs += "-Xopt-in=androidx.compose.animation.ExperimentalAnimationApi"
kotlinOptions.freeCompilerArgs += "-Xopt-in=androidx.compose.ui.ExperimentalComposeUiApi"
kotlinOptions.freeCompilerArgs += "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api"
kotlinOptions.freeCompilerArgs += "-opt-in=androidx.compose.animation.ExperimentalAnimationApi"
kotlinOptions.freeCompilerArgs += "-opt-in=androidx.compose.ui.ExperimentalComposeUiApi"
}
}

Expand All @@ -26,8 +26,8 @@ apply plugin: 'dagger.hilt.android.plugin'

android {
defaultConfig {
versionCode = 3
versionName = "1.2"
versionCode = 4
versionName = "1.3"
applicationId "kasem.sm.slime"
}
}
Expand Down
11 changes: 7 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext {
kspVersion = '1.7.10-1.0.6'
}
repositories {
google()
mavenCentral()
Expand Down Expand Up @@ -56,18 +59,18 @@ def provideUnitTestDeps(project) {
testImplementation("com.google.truth:truth:1.1.3")
testImplementation("junit:junit:4.13.2")
testImplementation("app.cash.turbine:turbine:0.8.0")
testImplementation("io.mockk:mockk:1.12.4")
testImplementation("io.mockk:mockk:1.12.5")
}
}

def provideUiTestDeps(project) {
project.dependencies {
androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.3.0-alpha01"
androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.3.0-alpha02"
androidTestImplementation "androidx.test.ext:junit:1.1.4-alpha07"
androidTestImplementation "androidx.test.espresso:espresso-core:3.5.0-alpha07"
androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.1.1"
androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.2.0"
androidTestImplementation "com.google.truth:truth:1.1.3"
debugImplementation "androidx.compose.ui:ui-test-manifest:1.3.0-alpha01"
debugImplementation "androidx.compose.ui:ui-test-manifest:1.3.0-alpha02"
}
}

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/java/Accompanist.kt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
object Accompanist {
private const val accompanistVersion = "0.24.13-rc"
private const val accompanistVersion = "0.26.0-alpha"
private const val prefix = "com.google.accompanist:accompanist"

const val sysUiController =
Expand Down
6 changes: 3 additions & 3 deletions buildSrc/src/main/java/Compose.kt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
object Compose {
private const val compostActivity = "1.6.0-alpha05"
private const val composeVersion = "1.2.0-rc03"
private const val composeMaterial3Version = "1.0.0-alpha14"
const val composeCompiler = "1.3.0-beta01"
private const val composeVersion = "1.3.0-alpha02"
private const val composeMaterial3Version = "1.0.0-alpha15"
const val composeCompiler = "1.3.0-rc01"

const val ui = "androidx.compose.ui:ui:$composeVersion"
const val material = "androidx.compose.material:material:$composeVersion"
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/java/Destinations.kt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
object Destinations {
private const val destinationVersion = "1.6.13-beta"
private const val destinationVersion = "1.7.15-beta"
const val core = "io.github.raamcosta.compose-destinations:animations-core:$destinationVersion"
const val ksp = "io.github.raamcosta.compose-destinations:ksp:$destinationVersion"
}
2 changes: 1 addition & 1 deletion buildSrc/src/main/java/Hilt.kt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
object Hilt {
private const val hiltVersion = "2.43"
private const val hiltVersion = "2.43.1"

const val gradle = "com.google.dagger:hilt-android-gradle-plugin:$hiltVersion"
const val library = "com.google.dagger:hilt-android:$hiltVersion"
Expand Down
2 changes: 1 addition & 1 deletion common-test-utils/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ artifacts {

dependencies {
// Test Libs
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.3")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4")
implementation("com.google.truth:truth:1.1.3")
implementation("junit:junit:4.13.2")

Expand Down
4 changes: 2 additions & 2 deletions common-ui/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ apply {

android {
buildFeatures {
kotlinOptions.freeCompilerArgs += "-Xopt-in=androidx.compose.animation.ExperimentalAnimationApi"
kotlinOptions.freeCompilerArgs += "-opt-in=androidx.compose.animation.ExperimentalAnimationApi"
}
}

Expand All @@ -21,5 +21,5 @@ dependencies {
implementation(Accompanist.swipeRefresh)
implementation(Accompanist.flowLayout)
implementation Accompanist.sysUiController
implementation "org.jetbrains.kotlin:kotlin-reflect:1.6.21"
implementation "org.jetbrains.kotlin:kotlin-reflect:1.7.10"
}
2 changes: 1 addition & 1 deletion core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ dependencies {

tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
kotlinOptions {
freeCompilerArgs = freeCompilerArgs + "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
freeCompilerArgs = freeCompilerArgs + "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
}
}
13 changes: 8 additions & 5 deletions database/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
apply plugin: 'com.android.library'
plugins {
id("com.android.library")
id 'com.google.devtools.ksp' version "${kspVersion}"
}

apply {
from("$rootDir/gradle/non-compose.gradle")
Expand Down Expand Up @@ -30,7 +33,7 @@ dependencies {

// Room
implementation AndroidX.room
kapt AndroidX.roomCompiler
ksp AndroidX.roomCompiler

// LiveData
implementation Lifecycle.livedataKtx
Expand All @@ -40,7 +43,7 @@ dependencies {
androidTestImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test:runner:1.5.0-alpha04'
androidTestImplementation "androidx.arch.core:core-testing:2.1.0"
androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.3"
androidTestImplementation 'com.google.dagger:hilt-android-testing:2.42'
kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.42'
androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4"
androidTestImplementation 'com.google.dagger:hilt-android-testing:2.43.1'
kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.43.1'
}
8 changes: 4 additions & 4 deletions gradle/common.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ android {
}
kotlinOptions {
jvmTarget = '1.8'
freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.FlowPreview"
freeCompilerArgs += "-Xopt-in=kotlin.Experimental"
freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
freeCompilerArgs += "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
freeCompilerArgs += "-opt-in=kotlinx.coroutines.FlowPreview"
freeCompilerArgs += "-opt-in=kotlin.Experimental"
}
buildFeatures {
compose true
Expand Down
8 changes: 4 additions & 4 deletions gradle/non-compose.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ android {
}
kotlinOptions {
jvmTarget = '1.8'
freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.FlowPreview"
freeCompilerArgs += "-Xopt-in=kotlin.Experimental"
freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
freeCompilerArgs += "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
freeCompilerArgs += "-opt-in=kotlinx.coroutines.FlowPreview"
freeCompilerArgs += "-opt-in=kotlin.Experimental"
}
packagingOptions {
resources {
Expand Down
2 changes: 1 addition & 1 deletion screen/ui-article-detail/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id("com.android.library")
id 'com.google.devtools.ksp' version '1.7.10-1.0.6'
id 'com.google.devtools.ksp' version "${kspVersion}"
}

apply {
Expand Down
2 changes: 1 addition & 1 deletion screen/ui-article-list/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id("com.android.library")
id 'com.google.devtools.ksp' version '1.7.10-1.0.6'
id 'com.google.devtools.ksp' version "${kspVersion}"
}

apply {
Expand Down
4 changes: 2 additions & 2 deletions screen/ui-auth/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id("com.android.library")
id 'com.google.devtools.ksp' version '1.7.10-1.0.6'
id 'com.google.devtools.ksp' version "${kspVersion}"
}

apply {
Expand All @@ -16,7 +16,7 @@ android {
}
}
buildFeatures {
kotlinOptions.freeCompilerArgs += "-Xopt-in=androidx.compose.ui.ExperimentalComposeUiApi"
kotlinOptions.freeCompilerArgs += "-opt-in=androidx.compose.ui.ExperimentalComposeUiApi"
}
defaultConfig {
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down
2 changes: 1 addition & 1 deletion screen/ui-bookmarks/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id("com.android.library")
id 'com.google.devtools.ksp' version '1.7.10-1.0.6'
id 'com.google.devtools.ksp' version "${kspVersion}"
}

apply {
Expand Down
2 changes: 1 addition & 1 deletion screen/ui-explore/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id("com.android.library")
id 'com.google.devtools.ksp' version '1.7.10-1.0.6'
id 'com.google.devtools.ksp' version "${kspVersion}"
}

apply {
Expand Down
2 changes: 1 addition & 1 deletion screen/ui-home/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id("com.android.library")
id 'com.google.devtools.ksp' version '1.7.10-1.0.6'
id 'com.google.devtools.ksp' version "${kspVersion}"
}

apply {
Expand Down
2 changes: 1 addition & 1 deletion screen/ui-profile/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id("com.android.library")
id 'com.google.devtools.ksp' version '1.7.10-1.0.6'
id 'com.google.devtools.ksp' version "${kspVersion}"
}

android {
Expand Down
2 changes: 1 addition & 1 deletion screen/ui-subscribe-topic/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id("com.android.library")
id 'com.google.devtools.ksp' version '1.7.10-1.0.6'
id 'com.google.devtools.ksp' version "${kspVersion}"
}

apply {
Expand Down

0 comments on commit 0647544

Please sign in to comment.