Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
StevenSorial committed Apr 10, 2021
1 parent d6bf435 commit ba728e0
Showing 6 changed files with 22 additions and 27 deletions.
27 changes: 14 additions & 13 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -3,12 +3,12 @@ apply plugin: "kotlin-android"
apply plugin: "androidx.navigation.safeargs.kotlin"

android {
compileSdkVersion 29
buildToolsVersion "30.0.2"
compileSdkVersion 30
buildToolsVersion "30.0.3"
defaultConfig {
applicationId "com.steven.muzeillect"
minSdkVersion 21
targetSdkVersion 29
targetSdkVersion 30
versionCode 16
versionName "3.0"
vectorDrawables.useSupportLibrary = true
@@ -45,20 +45,21 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

implementation "androidx.appcompat:appcompat:1.2.0"
implementation "com.google.android.material:material:1.2.0"
implementation "com.google.android.material:material:1.3.0"
implementation "androidx.preference:preference-ktx:1.1.1"
implementation "com.takisoft.preferencex:preferencex:1.1.0"
implementation "androidx.constraintlayout:constraintlayout:1.1.3"
implementation "androidx.work:work-runtime-ktx:2.4.0"
implementation "androidx.fragment:fragment-ktx:1.2.5"
implementation "androidx.navigation:navigation-fragment-ktx:2.3.0"
implementation "androidx.navigation:navigation-ui-ktx:2.3.0"
implementation "androidx.core:core-ktx:1.3.1"
implementation "androidx.constraintlayout:constraintlayout:2.0.4"
implementation "androidx.work:work-runtime-ktx:2.5.0"
implementation "androidx.fragment:fragment-ktx:1.3.2"
implementation "androidx.navigation:navigation-fragment-ktx:2.3.4"
implementation "androidx.navigation:navigation-ui-ktx:2.3.4"
implementation "androidx.core:core-ktx:1.3.2"
implementation "com.jakewharton.timber:timber:4.7.1"

implementation "com.squareup.okhttp3:okhttp:4.8.1"
implementation "com.squareup.okio:okio:2.8.0"
implementation "com.squareup.okhttp3:okhttp:4.9.1"
implementation "com.squareup.okio:okio:2.10.0"
implementation "org.jsoup:jsoup:1.13.1"
implementation "com.google.android.apps.muzei:muzei-api:3.4.0"

debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.4'
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
}
2 changes: 0 additions & 2 deletions app/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
-keeppackagenames org.jsoup.nodes

-keepnames class androidx.navigation.fragment.NavHostFragment
Original file line number Diff line number Diff line change
@@ -4,12 +4,15 @@ import android.content.Intent
import android.os.Bundle
import android.widget.Toast
import androidx.activity.ComponentActivity
import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
import androidx.annotation.StringRes
import androidx.core.net.toUri
import com.google.android.apps.muzei.api.MuzeiContract.Sources

class MuzeillectRedirectActivity : ComponentActivity() {

private val activityLauncher = registerForActivityResult(StartActivityForResult()) { finish() }

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
val isProviderSelected = Sources.isProviderSelected(this, "com.steven.muzeillect")
@@ -33,16 +36,11 @@ class MuzeillectRedirectActivity : ComponentActivity() {

private fun tryStartIntent(intent: Intent, @StringRes toastResId: Int?): Boolean {
try {
startActivityForResult(intent, 1)
activityLauncher.launch(intent)
toastResId?.let { showToast(it, Toast.LENGTH_LONG) }
return true
} catch (e: Exception) {
return false
}
}

override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)
finish()
}
}
2 changes: 0 additions & 2 deletions app/src/main/java/com/steven/muzeillect/SettingsFragment.kt
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
package com.steven.muzeillect

import android.os.Bundle
import androidx.annotation.Keep
import androidx.recyclerview.widget.RecyclerView
import com.takisoft.preferencex.PreferenceFragmentCompat

@Keep
class SettingsFragment : PreferenceFragmentCompat() {

override fun onCreatePreferencesFix(savedInstanceState: Bundle?, rootKey: String?) {
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
buildscript {
ext.kotlin_version = "1.4.0"
ext.kotlin_version = "1.4.32"

repositories {
google()
jcenter()
}

dependencies {
classpath 'com.android.tools.build:gradle:4.0.1'
classpath 'com.android.tools.build:gradle:4.1.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.3.0"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.3.4"
}
}

2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit ba728e0

Please sign in to comment.