Skip to content

Commit

Permalink
Merge pull request #23 from mcobunga/OW-020
Browse files Browse the repository at this point in the history 
OW-020: Refactoring [internal]
  • Loading branch information
@mcobunga
mcobunga authored Feb 22, 2024
2 parents 3b0e891 + 13ac7e6 commit 9b6cda5
Show file tree
Hide file tree
Showing 99 changed files with 1,341 additions and 329,028 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/openweather.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ jobs:
- name: Change wrapper permissions
run: chmod +x ./gradlew

- name: Get BASE_URL
env:
BASE_URL: $
run: echo BASE_URL=\"$BASE_URL\" > ./local.properties

- name: Get MAPS_API_KEY
env:
MAPS_API_KEY: $
Expand Down
96 changes: 38 additions & 58 deletions app/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.konan.properties.Properties
plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
id("kotlin-kapt")
id("com.google.devtools.ksp")
id("dagger.hilt.android.plugin")
id("kotlin-parcelize")
id("androidx.navigation.safeargs.kotlin")
Expand All @@ -23,7 +23,7 @@ android {
versionCode = 1
versionName = "1.0"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
testInstrumentationRunner = "com.bonface.openweather.HiltTestRunner"
vectorDrawables {
useSupportLibrary = true
}
Expand Down Expand Up @@ -84,110 +84,90 @@ android {
dependencies {

implementation("androidx.core:core-ktx:1.12.0")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
implementation("androidx.appcompat:appcompat:1.6.1")
implementation("com.google.android.material:material:1.10.0")
implementation("com.google.android.material:material:1.11.0")
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
implementation("androidx.cardview:cardview:1.0.0")

//Lifacycle
implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.6.2")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
implementation("androidx.lifecycle:lifecycle-process:2.6.2")
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2")
implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.7.0")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
implementation("androidx.lifecycle:lifecycle-process:2.7.0")
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0")
implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
kapt("androidx.lifecycle:lifecycle-common-java8:2.6.2")

ksp("androidx.lifecycle:lifecycle-common-java8:2.7.0")
//Firebase crashlytics
implementation("com.google.firebase:firebase-crashlytics:18.6.0")
implementation("com.google.firebase:firebase-analytics:21.5.0")

//Navigation
implementation("androidx.navigation:navigation-fragment-ktx:2.7.5")
implementation("androidx.navigation:navigation-ui-ktx:2.7.5")

implementation("androidx.navigation:navigation-fragment-ktx:2.7.7")
implementation("androidx.navigation:navigation-ui-ktx:2.7.7")
//Splash Screen
implementation("androidx.core:core-splashscreen:1.1.0-alpha02")

// Coroutines
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3")

// Coroutine Lifecycle Scopes
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")

implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
//Google Map
implementation("com.google.android.gms:play-services-maps:18.2.0")
implementation("com.google.android.gms:play-services-location:21.0.1")
implementation("com.google.android.gms:play-services-location:21.1.0")
//Places
implementation("com.google.android.libraries.places:places:3.3.0")

// Dexter (for permissions)
implementation("com.karumi:dexter:6.2.3")

//Dagger Hilt
implementation("com.google.dagger:hilt-android:2.48.1")
kapt("com.google.dagger:hilt-android-compiler:2.48.1")

implementation("com.google.dagger:hilt-android:2.50")
ksp("com.google.dagger:hilt-android-compiler:2.50")
//Recyclerview
implementation("androidx.recyclerview:recyclerview:1.3.2")

//Retrofit
implementation("com.squareup.retrofit2:retrofit:2.9.0")
//OKHTTP
implementation("com.squareup.okhttp3:okhttp:5.0.0-alpha.2")
implementation("com.squareup.okhttp3:okhttp:5.0.0-alpha.6")
//Logging Interceptor
implementation("com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.6")

implementation("com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.11")
//Moshi
implementation("com.squareup.moshi:moshi-kotlin:1.15.0")
//noinspection KaptUsageInsteadOfKsp
kapt("com.squareup.moshi:moshi-kotlin-codegen:1.15.0")
ksp("com.squareup.moshi:moshi-kotlin-codegen:1.15.0")
implementation("com.squareup.retrofit2:converter-moshi:2.9.0")

//Timber
implementation("com.jakewharton.timber:timber:5.0.1")

//Room Database
implementation("androidx.room:room-runtime:2.6.0")
implementation("androidx.room:room-ktx:2.6.0")
implementation("androidx.room:room-runtime:2.6.1")
implementation("androidx.room:room-ktx:2.6.1")
//noinspection KaptUsageInsteadOfKsp
kapt("androidx.room:room-compiler:2.6.0")

ksp("androidx.room:room-compiler:2.6.1")
//Palette
implementation("androidx.palette:palette-ktx:1.0.0")

//Tests
testImplementation("junit:junit:4.13.2")
implementation("androidx.test.ext:junit-ktx:1.1.5")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
// Espresso
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
androidTestImplementation("androidx.test.espresso:espresso-contrib:3.5.1")
androidTestImplementation ("androidx.test.espresso:espresso-intents:3.5.1")

androidTestImplementation("androidx.test:rules:1.5.0")
androidTestImplementation("androidx.test:core-ktx:1.5.0")
androidTestImplementation("org.robolectric:robolectric:4.11.1")

// For instrumented tests.
androidTestImplementation("com.google.dagger:hilt-android-testing:2.48.1")
kaptAndroidTest("com.google.dagger:hilt-android-compiler:2.48.1")
androidTestAnnotationProcessor("com.google.dagger:hilt-android-compiler:2.48.1")

testImplementation("io.mockk:mockk:1.13.8")
testImplementation("com.squareup.okhttp3:mockwebserver:5.0.0-alpha.11")
testImplementation("android.arch.core:core-testing:1.1.1")
testImplementation("com.google.truth:truth:1.1.5")
testImplementation("org.mockito:mockito-core:5.3.1")
testImplementation("org.mockito.kotlin:mockito-kotlin:4.1.0")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3")

testImplementation("androidx.room:room-testing:2.6.1")
testImplementation("androidx.arch.core:core-testing:2.2.0")
testImplementation("app.cash.turbine:turbine:1.0.0")
testImplementation("org.robolectric:robolectric:4.11.1")
testImplementation("com.google.truth:truth:1.1.5")
testImplementation("androidx.room:room-testing:2.6.0")

testImplementation("com.google.dagger:hilt-android-testing:2.48.1")
kaptTest("com.google.dagger:hilt-android-compiler:2.48.1")
// Instrumented Unit Tests
androidTestImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.2.1")
androidTestImplementation("androidx.arch.core:core-testing:2.2.0")
androidTestImplementation("com.google.truth:truth:1.1.5")
androidTestImplementation("org.mockito:mockito-core:5.3.1")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
androidTestImplementation("com.google.dagger:hilt-android-testing:2.50")
kspAndroidTest("com.google.dagger:hilt-android-compiler:2.50")


}

Expand Down
Loading

0 comments on commit 9b6cda5

Please sign in to comment.