diff --git a/app/build.gradle b/app/build.gradle index 7635b8c1..76b01ea8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -82,9 +82,6 @@ android { defaultConfig { vectorDrawables.useSupportLibrary = true } - lintOptions { - checkReleaseBuilds = false - } buildFeatures { dataBinding = true viewBinding = true @@ -98,7 +95,9 @@ android { jvmTarget = "1.8" } packagingOptions { - exclude 'META-INF/library-core_release.kotlin_module' + resources { + excludes += ['META-INF/library-core_release.kotlin_module'] + } } externalNativeBuild { cmake { @@ -106,6 +105,9 @@ android { version "3.10.2" } } + lint { + checkReleaseBuilds false + } } tasks.whenTaskAdded { task -> @@ -143,25 +145,25 @@ dependencies { coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.1.5" // Android Jetpack - implementation "androidx.appcompat:appcompat:1.3.1" + implementation "androidx.appcompat:appcompat:1.5.1" implementation "androidx.cardview:cardview:1.0.0" - implementation "androidx.constraintlayout:constraintlayout:2.1.1" - implementation "androidx.core:core-ktx:1.6.0" - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1" - implementation "androidx.navigation:navigation-fragment-ktx:2.3.5" + implementation "androidx.constraintlayout:constraintlayout:2.1.4" + implementation "androidx.core:core-ktx:1.9.0" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.navigation:navigation-fragment-ktx:2.5.2" implementation "androidx.recyclerview:recyclerview:1.2.1" - implementation "androidx.room:room-runtime:2.3.0" - implementation "androidx.work:work-runtime-ktx:2.6.0" - kapt "androidx.room:room-compiler:2.3.0" + implementation "androidx.room:room-runtime:2.4.3" + implementation "androidx.work:work-runtime-ktx:2.7.1" + kapt "androidx.room:room-compiler:2.4.3" // Google design libs - implementation "com.google.android.material:material:1.4.0" + implementation "com.google.android.material:material:1.6.1" implementation "com.google.android.flexbox:flexbox:3.0.0" // Play Services/Firebase implementation "com.google.android.gms:play-services-wearable:17.1.0" - implementation "com.google.firebase:firebase-core:19.0.2" - implementation "com.google.firebase:firebase-crashlytics:18.2.3" + implementation("com.google.firebase:firebase-core") { version { strictly "19.0.2" } } + implementation "com.google.firebase:firebase-crashlytics:18.2.13" implementation("com.google.firebase:firebase-messaging") { version { strictly "20.1.3" } } // OkHttp, Retrofit, Gson, Jsoup diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c710c6b8..2635faf7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -43,6 +43,7 @@ android:configChanges="orientation|screenSize" android:label="@string/app_name" android:launchMode="singleTop" + android:exported="true" android:theme="@style/SplashTheme"> @@ -66,6 +67,7 @@ android:configChanges="orientation|keyboardHidden" android:excludeFromRecents="true" android:noHistory="true" + android:exported="true" android:theme="@style/AppTheme.Dark.NoDisplay"> @@ -73,7 +75,8 @@ + android:label="@string/widget_timetable_title" + android:exported="true"> @@ -88,10 +91,12 @@ android:configChanges="orientation|keyboardHidden" android:excludeFromRecents="true" android:noHistory="true" + android:exported="true" android:theme="@style/AppTheme.Dark.NoDisplay" /> + android:label="@string/widget_notifications_title" + android:exported="true"> @@ -104,7 +109,8 @@ android:permission="android.permission.BIND_REMOTEVIEWS" /> + android:label="@string/widget_lucky_number_title" + android:exported="true"> @@ -124,29 +130,36 @@ - - + + + android:enabled="true" + android:exported="true"> - + diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/EventDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/EventDao.kt index 5c64613e..24e58d02 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/EventDao.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/EventDao.kt @@ -109,7 +109,7 @@ abstract class EventDao : BaseDao { abstract fun removeNotManual(profileId: Int)*/ @RawQuery - abstract fun dontKeepFuture(query: SupportSQLiteQuery?): Long + abstract fun dontKeepFuture(query: SupportSQLiteQuery): Long @Transaction open fun dontKeepFuture(profileId: Int, todayDate: Date, filter: String) { diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/HomeFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/HomeFragment.kt index 78ac63e7..54f94433 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/HomeFragment.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/HomeFragment.kt @@ -198,7 +198,7 @@ class HomeFragment : Fragment(), CoroutineScope { } } - override fun performAccessibilityAction(host: View, action: Int, args: Bundle): Boolean { + override fun performAccessibilityAction(host: View, action: Int, args: Bundle?): Boolean { val fromPosition: Int = b.list.getChildLayoutPosition(host) if (action == R.id.move_card_down_action) { swapCards(fromPosition, fromPosition + 1, adapter) diff --git a/build.gradle b/build.gradle index b1416494..c259c51b 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ buildscript { ext { - kotlin_version = '1.5.30' + kotlin_version = '1.6.10' release = [ versionName: "4.11.6", @@ -10,9 +10,9 @@ buildscript { ] setup = [ - compileSdk: 30, + compileSdk: 33, minSdk : 16, - targetSdk : 30 + targetSdk : 33 ] } @@ -21,10 +21,10 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.3' + classpath 'com.android.tools.build:gradle:7.2.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'com.google.gms:google-services:4.3.10' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1' + classpath 'com.google.gms:google-services:4.3.13' + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.1' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4c24d72f..e004eb08 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Wed Feb 17 14:04:38 CET 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME