Skip to content

Commit

Permalink
Dependency update; Target = Android 12
Browse files Browse the repository at this point in the history
  • Loading branch information
truefedex committed Nov 20, 2022
1 parent bd0a9ec commit 2e003b0
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 21 deletions.
25 changes: 14 additions & 11 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,14 @@ if (localPropertiesFile.exists()) {
}

android {
compileSdk = 31
buildToolsVersion = "31.0.0"
compileSdk = 32
buildToolsVersion = "32.0.0"
namespace = "com.phlox.tvwebbrowser"

defaultConfig {
applicationId = "com.phlox.tvwebbrowser"
minSdk = 21
targetSdk = 30
targetSdk = 31
versionCode = 53
versionName = "1.8.2"

Expand Down Expand Up @@ -71,6 +72,8 @@ android {
targetCompatibility to JavaVersion.VERSION_1_8
}

lint.disable += setOf("UNUSED_PARAMETER")

kapt {
arguments {
//used when AppDatabase @Database annotation exportSchema = true. Useful for migrations
Expand All @@ -82,16 +85,16 @@ android {
dependencies {
implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))

implementation("androidx.appcompat:appcompat:1.4.1")
implementation("androidx.appcompat:appcompat:1.5.1")
implementation("androidx.webkit:webkit:1.4.0")
implementation("androidx.constraintlayout:constraintlayout:2.1.3")
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
implementation("androidx.recyclerview:recyclerview:1.2.1")

implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.20")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0")
implementation("org.jetbrains.kotlin:kotlin-reflect:1.6.20")
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.21")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
implementation("org.jetbrains.kotlin:kotlin-reflect:1.7.21")

implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.4.1")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.5.1")

val roomVersion = "2.4.2"
implementation("androidx.room:room-runtime:$roomVersion")
Expand All @@ -105,8 +108,8 @@ dependencies {
"debugImplementation"("com.squareup.leakcanary:leakcanary-android:2.7")

//appstore-dependent dependencies
"googleImplementation"("com.google.firebase:firebase-core:20.1.2")
"googleImplementation"("com.google.firebase:firebase-crashlytics-ktx:18.2.9")
"googleImplementation"("com.google.firebase:firebase-core:21.1.1")
"googleImplementation"("com.google.firebase:firebase-crashlytics-ktx:18.3.2")
}

tasks.getByName("check").dependsOn("lint")
3 changes: 1 addition & 2 deletions app/src/amazon/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.phlox.tvwebbrowser">
xmlns:tools="http://schemas.android.com/tools">

<application
android:name=".TVBro"
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.phlox.tvwebbrowser">
xmlns:tools="http://schemas.android.com/tools">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
Expand Down Expand Up @@ -54,7 +53,8 @@
android:label="@string/app_name_short"
android:launchMode="singleTask"
android:configChanges="uiMode"
android:logo="@drawable/banner">
android:logo="@drawable/banner"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-it/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
<string name="downloads">File scaricati</string>
<string name="downloads_notifications_description">Notifiche sullo stato dei download</string>
<string name="main">Principale</string>
<string name="version_and_updates">Versione & Info</string>
<string name="version_and_updates">Versione &amp; Info</string>
<string name="version_s">Versione: %s</string>
<string name="update_channel">Canale aggiornamenti:</string>
<string name="auto_check_for_updates">Verifica aggiornamenti</string>
Expand Down
6 changes: 3 additions & 3 deletions build.gradle.kts
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:7.1.3")
classpath("com.android.tools.build:gradle:7.3.1")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.20")
classpath("com.google.gms:google-services:4.3.10")
classpath("com.google.firebase:firebase-crashlytics-gradle:2.8.1")
classpath("com.google.gms:google-services:4.3.14")
classpath("com.google.firebase:firebase-crashlytics-gradle:2.9.2")

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
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-7.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip

0 comments on commit 2e003b0

Please sign in to comment.