[go: up one dir, main page]

Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
b-lam committed Aug 15, 2021
1 parent 7aa027f commit 616a3e3
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 37 deletions.
5 changes: 5 additions & 0 deletions .idea/jarRepositories.xml

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

13 changes: 0 additions & 13 deletions .idea/runConfigurations.xml

This file was deleted.

36 changes: 18 additions & 18 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apply plugin: 'com.android.application'
apply plugin: 'com.google.android.gms.oss-licenses-plugin'
apply plugin: 'com.google.firebase.crashlytics'
apply plugin: 'com.google.gms.google-services'
apply plugin: 'com.google.firebase.crashlytics'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt'
apply plugin: 'kotlin-parcelize'
Expand Down Expand Up @@ -71,18 +71,18 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])

// Support libraries
implementation 'androidx.appcompat:appcompat:1.3.0'
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'androidx.browser:browser:1.3.0'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation 'androidx.core:core-ktx:1.5.0'
implementation 'androidx.fragment:fragment-ktx:1.3.4'
implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
implementation 'androidx.core:core-ktx:1.6.0'
implementation 'androidx.fragment:fragment-ktx:1.3.6'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.paging:paging-runtime-ktx:2.1.2'
implementation 'androidx.preference:preference-ktx:1.1.1'
implementation 'androidx.recyclerview:recyclerview:1.2.0'
implementation 'androidx.recyclerview:recyclerview:1.2.1'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
implementation 'androidx.work:work-runtime-ktx:2.6.0-alpha02'
implementation 'androidx.work:work-runtime-ktx:2.6.0-rc01'

// Lifecycle
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
Expand All @@ -95,15 +95,15 @@ dependencies {
kapt 'androidx.room:room-compiler:2.3.0'

// Material components
implementation 'com.google.android.material:material:1.3.0'
implementation 'com.google.android.material:material:1.4.0'

// Billing
implementation 'com.android.billingclient:billing:3.0.3'
implementation 'com.android.billingclient:billing-ktx:3.0.3'

// Kotlin coroutines
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0'

// OkHttp
implementation 'com.squareup.okhttp3:okhttp:4.9.0'
Expand All @@ -126,15 +126,15 @@ dependencies {
kapt 'com.github.bumptech.glide:compiler:4.12.0'

// Koin
implementation 'io.insert-koin:koin-android:3.0.1'
implementation 'io.insert-koin:koin-android-ext:3.0.1'
implementation 'io.insert-koin:koin-androidx-workmanager:3.0.1'
implementation 'io.insert-koin:koin-android:3.1.1'
implementation 'io.insert-koin:koin-android-ext:3.0.2'
implementation 'io.insert-koin:koin-androidx-workmanager:3.1.1'

// Firebase
implementation 'com.google.firebase:firebase-analytics-ktx:19.0.0'
implementation 'com.google.firebase:firebase-crashlytics:18.0.0'
implementation 'com.google.firebase:firebase-crashlytics:18.2.1'
implementation 'com.google.firebase:firebase-inappmessaging-ktx:20.0.0'
implementation 'com.google.firebase:firebase-firestore-ktx:23.0.0'
implementation 'com.google.firebase:firebase-firestore-ktx:23.0.3'
implementation 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava'

// Play Core
Expand Down Expand Up @@ -167,9 +167,9 @@ dependencies {

// Unit tests
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test:runner:1.3.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test:runner:1.4.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'

// Room testing
androidTestImplementation "androidx.room:room-testing:2.3.0"
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/com/b_lam/resplash/di/NetworkModule.kt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import com.b_lam.resplash.domain.login.AccessTokenProvider
import okhttp3.Interceptor
import okhttp3.OkHttpClient
import okhttp3.logging.HttpLoggingInterceptor
import org.koin.android.ext.koin.androidContext
import org.koin.dsl.module
import retrofit2.Retrofit
import retrofit2.converter.moshi.MoshiConverterFactory
Expand All @@ -26,6 +27,7 @@ private const val UNSPLASH_API_BASE_URL = "https://api.unsplash.com/"
val networkModule = module {

single(createdAtStart = true) { createOkHttpClient(get()) }
single(createdAtStart = true) { AccessTokenProvider(androidContext()) }
factory { createAccessTokenInterceptor(get()) }
factory { createConverterFactory() }
factory { createService<PhotoService>(get(), get()) }
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/java/com/b_lam/resplash/di/StorageModule.kt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import android.app.Application
import androidx.room.Room
import com.b_lam.resplash.data.autowallpaper.AutoWallpaperDatabase
import com.b_lam.resplash.domain.SharedPreferencesRepository
import com.b_lam.resplash.domain.login.AccessTokenProvider
import org.koin.android.ext.koin.androidApplication
import org.koin.android.ext.koin.androidContext
import org.koin.dsl.module
Expand All @@ -16,7 +15,6 @@ val storageModule = module {
androidContext()
)
}
single(createdAtStart = true) { AccessTokenProvider(androidContext()) }

single { createWallpaperDatabase(androidApplication()) }
single { get<AutoWallpaperDatabase>().autoWallpaperHistoryDao() }
Expand Down
7 changes: 4 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.0'
classpath 'com.android.tools.build:gradle:7.0.0'
classpath 'com.google.android.gms:oss-licenses-plugin:0.10.4'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.2'
classpath 'com.google.gms:google-services:4.3.5'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1'
classpath 'com.google.gms:google-services:4.3.10'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -20,6 +20,7 @@ buildscript {
allprojects {
repositories {
google()
mavenCentral()
maven { url "https://jitpack.io" }
maven { url "https://oss.jfrog.org/libs-snapshot" }
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip

0 comments on commit 616a3e3

Please sign in to comment.