Skip to content

Commit

Permalink
Upgrade dependencies to compile with Arctic Fox Beta 4, Compose Beta09
Browse files Browse the repository at this point in the history
Using AGP 7.1.0-alpha02 to workaround google/dagger#2700. Arctic Fox Beta 05 should solve the problem and we can go back to the less bleeding edge versions.

Also updates

* Kotlin to 1.5.10
* Coroutines to 1.5.0
  • Loading branch information
dptsolutions committed Jun 27, 2021
1 parent 6b4876f commit 802f373
Show file tree
Hide file tree
Showing 10 changed files with 63 additions and 21 deletions.
3 changes: 3 additions & 0 deletions .idea/.gitignore

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

8 changes: 8 additions & 0 deletions .idea/modules.xml

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

17 changes: 17 additions & 0 deletions .idea/podcast-app.iml

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

6 changes: 6 additions & 0 deletions .idea/vcs.xml

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

4 changes: 3 additions & 1 deletion android/.idea/misc.xml

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

28 changes: 17 additions & 11 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ android {
useSupportLibrary true
}

buildConfigField "String", "API_KEY", localProperties['apiKey']
buildConfigField "String", "API_KEY", "\"" + localProperties['apiKey'] + "\""
}

buildTypes {
Expand Down Expand Up @@ -52,39 +52,45 @@ android {

dependencies {

implementation 'androidx.core:core-ktx:1.3.2'
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.core:core-ktx:1.5.0'
implementation 'androidx.appcompat:appcompat:1.3.0'
implementation 'com.google.android.material:material:1.3.0'
implementation "androidx.compose.ui:ui:$compose_version"
implementation "androidx.compose.material:material:$compose_version"
implementation "androidx.compose.ui:ui-tooling:$compose_version"
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.0-alpha01'
implementation 'androidx.activity:activity-compose:1.3.0-alpha07'
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha04"
testImplementation 'junit:junit:4.+'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.0-alpha02'
implementation 'androidx.activity:activity-compose:1.3.0-beta02'
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha07"
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"

// Kotlin
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"


// Navigation
implementation "androidx.navigation:navigation-compose:1.0.0-alpha10"
implementation "androidx.navigation:navigation-compose:2.4.0-alpha03"

// Compose Accompanist
implementation "com.google.accompanist:accompanist-insets:$accompanist_version"
implementation "com.google.accompanist:accompanist-coil:$accompanist_version"

// Hilt - dependency injection
implementation "com.google.dagger:hilt-android:$hilt_version"
kapt "com.google.dagger:hilt-android-compiler:$hilt_version"
kapt "com.google.dagger:hilt-compiler:$hilt_version"
implementation 'androidx.hilt:hilt-lifecycle-viewmodel:1.0.0-alpha03'
kapt 'androidx.hilt:hilt-compiler:1.0.0-beta01'
kapt 'androidx.hilt:hilt-compiler:1.0.0'

// Retrofit
implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
implementation "com.squareup.retrofit2:converter-gson:$retrofit_version"

// Preferences DataStore
implementation "androidx.datastore:datastore-preferences:1.0.0-beta01"
implementation "androidx.datastore:datastore-preferences:1.0.0-beta02"

// ExoPlayer
implementation "com.google.android.exoplayer:exoplayer:$exo_player_version"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.navigation.NavHostController
import androidx.navigation.compose.navigate
import com.fabirt.podcastapp.domain.model.Episode
import com.fabirt.podcastapp.ui.common.PreviewContent
import com.fabirt.podcastapp.ui.common.StaggeredVerticalGrid
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.navigation.compose.navigate
import androidx.navigation.compose.popUpTo
import com.fabirt.podcastapp.ui.common.PreviewContent
import com.fabirt.podcastapp.ui.navigation.Destination
import com.fabirt.podcastapp.ui.navigation.Navigator
Expand Down
13 changes: 8 additions & 5 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext {
compose_version = '1.0.0-beta05'
kotlin_version = '1.5.10'
kotlin_coroutines_version = '1.5.0'
compose_version = '1.0.0-beta09'
accompanist_version = '0.8.1'
room_version = "2.2.6"
hilt_version = "2.35"
hilt_version = "2.37"
retrofit_version = "2.9.0"
exo_player_version = "2.13.3"
exo_player_version = "2.14.1"
glide_version = "4.11.0"
}
repositories {
google()
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:7.0.0-alpha15"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32"
// classpath 'com.android.tools.build:gradle:7.0.0-beta04'
classpath 'com.android.tools.build:gradle:7.1.0-alpha02' // Workaround for beta 04 failure with Hilt, go back at beta05
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
}
Expand Down
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Apr 30 18:22:17 COT 2021
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME

0 comments on commit 802f373

Please sign in to comment.