diff --git a/app/build.gradle b/app/build.gradle index beb16d28..cc54f640 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,14 +7,16 @@ plugins { } android { + compileSdkVersion 33 + buildToolsVersion '33.0.0' namespace 'com.rtbishop.look4sat' - compileSdk 34 + defaultConfig { applicationId "com.rtbishop.look4sat" minSdk 21 - targetSdk 34 - versionCode 320 - versionName '3.2.0' + targetSdk 33 + versionCode 312 + versionName '3.1.2' testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { @@ -44,11 +46,11 @@ android { kotlinCompilerExtensionVersion compose_compiler_version } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() + jvmTarget = JavaVersion.VERSION_11.toString() } testOptions { animationsDisabled true @@ -62,7 +64,7 @@ android { } kotlin { - jvmToolchain(17) + jvmToolchain(11) } dependencies { @@ -81,7 +83,7 @@ dependencies { kapt "androidx.room:room-compiler:$room_version" implementation "com.google.dagger:hilt-android:$hilt_version" kapt "com.google.dagger:hilt-compiler:$hilt_version" - implementation "com.squareup.okhttp3:okhttp:$okhttp_version" + implementation "com.jakewharton.timber:timber:$timber_version" implementation "org.osmdroid:osmdroid-android:$osmdroid_version" implementation "androidx.activity:activity-compose:$activity_compose_version" diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/MainApplication.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/MainApplication.kt index 42dac8d5..d671e28f 100644 --- a/app/src/main/java/com/rtbishop/look4sat/presentation/MainApplication.kt +++ b/app/src/main/java/com/rtbishop/look4sat/presentation/MainApplication.kt @@ -18,10 +18,11 @@ package com.rtbishop.look4sat.presentation import android.app.Application -import android.util.Log +import com.rtbishop.look4sat.BuildConfig import com.rtbishop.look4sat.domain.IDataRepository import com.rtbishop.look4sat.framework.SettingsManager import dagger.hilt.android.HiltAndroidApp +import timber.log.Timber import java.text.SimpleDateFormat import java.util.* import javax.inject.Inject @@ -37,6 +38,9 @@ class MainApplication : Application() { override fun onCreate() { super.onCreate() + if (BuildConfig.DEBUG) { + Timber.plant(Timber.DebugTree()) + } checkAutoUpdate() } @@ -45,7 +49,7 @@ class MainApplication : Application() { val timeDelta = System.currentTimeMillis() - settingsManager.getLastUpdateTime() if (timeDelta > 172800000) { // 48 hours in ms val sdf = SimpleDateFormat("d MMM yyyy - HH:mm:ss", Locale.getDefault()) - Log.d("AutoUpdate", "Started periodic data update on ${sdf.format(Date())}") + Timber.d("Started periodic data update on ${sdf.format(Date())}") repository.updateFromWeb() } } diff --git a/build.gradle b/build.gradle index cbf27cd7..bcb1dc7c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,10 @@ buildscript { ext { - hilt_version = '2.44.2' + hilt_version = '2.45' hilt_compose_version = '1.0.0' - application_version = '7.4.0' + application_version = '7.4.1' library_version = '7.1.2' - kotlin_android_version = '1.8.0' + kotlin_android_version = '1.8.10' core_ktx_version = '1.9.0' core_splashscreen_version = '1.0.0' constraint_version = '2.1.4' @@ -12,15 +12,16 @@ buildscript { navigation_version = '2.5.3' work_version = '2.7.1' room_version = '2.5.0' + timber_version = '5.0.1' osmdroid_version = '6.1.14' json_version = '20220924' compose_version = '1.3.3' - compose_compiler_version = '1.4.0' + compose_compiler_version = '1.4.2' activity_compose_version = '1.6.1' material3_version = '1.0.1' - leakcanary_version = '2.9.1' + leakcanary_version = '2.10' junit_version = '4.13.2' - mockito_version = '4.9.0' + mockito_version = '5.1.1' coroutines_test_version = '1.6.4' androidx_test_version = '1.5.2' androidx_junit_version = '1.1.5' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 764d9d1b..7702c1e8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jan 27 13:22:02 GMT 2023 +#Fri Feb 17 17:52:48 GMT 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME