Skip to content

Commit

Permalink
⬆️ bump deps
Browse files Browse the repository at this point in the history
  • Loading branch information
theapache64 committed Nov 8, 2022
1 parent 047b701 commit 4128f4e
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 27 deletions.
17 changes: 17 additions & 0 deletions .idea/deploymentTargetDropDown.xml

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

2 changes: 0 additions & 2 deletions .idea/gradle.xml

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

31 changes: 15 additions & 16 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ plugins {
}

android {
compileSdkVersion 30
compileSdkVersion 33

defaultConfig {
applicationId "com.theapache64.topcorn2"
minSdkVersion 21
targetSdkVersion 30
targetSdkVersion 33
versionCode 10003
versionName "1.0.0-alpha03"
versionName "1.0.0-alpha04"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
Expand All @@ -36,7 +36,6 @@ android {
}
kotlinOptions {
jvmTarget = '1.8'
useIR = true
// Disabling coroutine's ExperimentalCoroutinesApi warning
freeCompilerArgs += [
"-Xuse-experimental=kotlinx.coroutines.ExperimentalCoroutinesApi",
Expand All @@ -46,16 +45,16 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion compose_version
kotlinCompilerExtensionVersion compose_compiler_version
}
}

dependencies {

implementation 'androidx.core:core-ktx:1.6.0'
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'com.google.android.material:material:1.4.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.appcompat:appcompat:1.5.1'
implementation 'com.google.android.material:material:1.7.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'

// Navigation
implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
Expand All @@ -74,20 +73,20 @@ dependencies {
implementation "androidx.hilt:hilt-navigation-fragment:1.0.0"

// Room
def room_version = "2.3.0"
def room_version = "2.4.3"
implementation "androidx.room:room-runtime:$room_version"
implementation "androidx.room:room-ktx:$room_version"
kapt "androidx.room:room-compiler:$room_version"

// Retrofit
def retrofit_version = '2.9.0'
implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
implementation 'com.squareup.okhttp3:logging-interceptor:4.9.0'
implementation 'com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.2'
implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofit_version"

// Moshi : Moshi
implementation 'com.squareup.moshi:moshi:1.12.0'
kapt 'com.squareup.moshi:moshi-kotlin-codegen:1.12.0'
implementation 'com.squareup.moshi:moshi:1.13.0'
kapt 'com.squareup.moshi:moshi-kotlin-codegen:1.13.0'
implementation 'com.squareup.retrofit2:converter-moshi:2.9.0'

testImplementation 'junit:junit:4.13.2'
Expand All @@ -99,13 +98,13 @@ dependencies {
implementation 'com.jakewharton.timber:timber:5.0.1'

// Kotlinx Coroutines Core : Coroutines support libraries for Kotlin
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'

// Coil - Image loading library
implementation("io.coil-kt:coil-compose:1.3.2")
implementation("io.coil-kt:coil-compose:2.1.0")

// Kotlin Lifecycle KTX
def lifecycle_version = "2.3.1"
def lifecycle_version = "2.5.1"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

<activity
android:name=".ui.main.MainActivity"
android:exported="true"
android:theme="@style/Theme.TopCorn2.NoActionBar">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@file:OptIn(ExperimentalTime::class)

package com.theapache64.topcorn2.data.repo

import android.content.SharedPreferences
Expand All @@ -11,7 +13,7 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.flowOn
import javax.inject.Inject
import kotlin.time.Duration
import kotlin.time.Duration.Companion.hours
import kotlin.time.ExperimentalTime

class MoviesRepo @Inject constructor(
Expand All @@ -21,7 +23,7 @@ class MoviesRepo @Inject constructor(
) {

companion object {
private val MOVIE_EXPIRY_IN_MILLIS = Duration.hours(1).inWholeMilliseconds
private val MOVIE_EXPIRY_IN_MILLIS = 1.hours.inWholeMilliseconds
private const val KEY_LAST_SYNCED = "last_synced"
}

Expand Down
11 changes: 6 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext {
kotlin_version = '1.5.21'
hilt_version = '2.38.1'
nav_version = '2.3.5'
compose_version = '1.0.2'
kotlin_version = '1.7.20'
hilt_version = '2.44'
nav_version = '2.5.3'
compose_version = '1.3.0'
compose_compiler_version = '1.3.2'
}
repositories {
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.0.2'
classpath 'com.android.tools.build:gradle:7.3.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sun Jan 03 20:12:08 IST 2021
#Tue Nov 08 08:58:53 IST 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME

0 comments on commit 4128f4e

Please sign in to comment.