Commit 99fefa8f authored by Daniel Wolf's avatar Daniel Wolf
Browse files

Update dependencies

parent 0ba7094a
...@@ -2,7 +2,6 @@ apply plugin: 'com.android.application' ...@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
apply plugin: 'kotlin-android' apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-kapt'
apply plugin: 'app.cash.exhaustive'
def debugKeyPath = new File(System.properties['user.home'], ".android/debug.keystore") def debugKeyPath = new File(System.properties['user.home'], ".android/debug.keystore")
...@@ -138,27 +137,27 @@ android { ...@@ -138,27 +137,27 @@ android {
//} //}
dependencies { dependencies {
def room_version = "2.2.6" def room_version = "2.3.0"
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$KOTLIN_VERSION" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$KOTLIN_VERSION"
implementation('org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2') implementation('org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0')
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2' implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0'
implementation 'com.frostnerd.utilskt:lifecycle:1.2.1' implementation 'com.frostnerd.utilskt:lifecycle:1.2.1'
implementation 'com.frostnerd.utilskt:preferences:1.5.30' // https://git.frostnerd.com/AndroidUtils/preferenceskt implementation 'com.frostnerd.utilskt:preferences:1.5.30' // https://git.frostnerd.com/AndroidUtils/preferenceskt
implementation 'com.frostnerd.utilskt:navigationdraweractivity:1.4.2' // https://git.frostnerd.com/AndroidUtils/navigationdraweractivity implementation 'com.frostnerd.utilskt:navigationdraweractivity:1.4.2' // https://git.frostnerd.com/AndroidUtils/navigationdraweractivity
implementation 'com.frostnerd.utilskt:encrypteddnstunnelproxy:2.1.24' // https://git.frostnerd.com/AndroidUtils/encrypteddnstunnelproxy implementation 'com.frostnerd.utilskt:encrypteddnstunnelproxy:2.1.28' // https://git.frostnerd.com/AndroidUtils/encrypteddnstunnelproxy
implementation 'com.frostnerd.utilskt:general:1.0.25' // https://git.frostnerd.com/AndroidUtils/generalkt implementation 'com.frostnerd.utilskt:general:1.0.25' // https://git.frostnerd.com/AndroidUtils/generalkt
implementation 'com.frostnerd.utilskt:adapters:1.3.4' // https://git.frostnerd.com/AndroidUtils/Adapters implementation 'com.frostnerd.utilskt:adapters:1.3.4' // https://git.frostnerd.com/AndroidUtils/Adapters
implementation 'androidx.work:work-runtime:2.4.0' implementation 'androidx.work:work-runtime:2.5.0'
implementation 'androidx.appcompat:appcompat:1.3.0-beta01' implementation 'androidx.appcompat:appcompat:1.3.0-rc01'
implementation "androidx.preference:preference:1.1.1" implementation "androidx.preference:preference:1.1.1"
implementation "com.google.android.material:material:1.3.0-rc01" implementation "com.google.android.material:material:1.3.0"
implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0-alpha01' implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0-alpha01'
implementation "androidx.core:core-ktx:1.3.2" implementation "androidx.core:core-ktx:1.5.0-rc02"
implementation "androidx.room:room-runtime:$room_version" implementation "androidx.room:room-runtime:$room_version"
kapt "androidx.room:room-compiler:$room_version" kapt "androidx.room:room-compiler:$room_version"
...@@ -169,12 +168,12 @@ dependencies { ...@@ -169,12 +168,12 @@ dependencies {
implementation 'com.github.jorgecastilloprz:fabprogresscircle:1.01@aar' implementation 'com.github.jorgecastilloprz:fabprogresscircle:1.01@aar'
leakCanaryImplementation 'com.squareup.leakcanary:leakcanary-android:2.6' leakCanaryImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
implementation "com.squareup.okhttp3:okhttp:4.9.0" implementation "com.squareup.okhttp3:okhttp:4.9.1"
implementation 'com.github.AppIntro:AppIntro:6.0.0' implementation 'com.github.AppIntro:AppIntro:6.0.0'
implementation 'com.google.android.play:core:1.9.0' implementation 'com.google.android.play:core:1.10.0'
} }
def getGitCommitHash() { def getGitCommitHash() {
......
...@@ -5,7 +5,6 @@ import android.view.LayoutInflater ...@@ -5,7 +5,6 @@ import android.view.LayoutInflater
import android.view.View import android.view.View
import android.widget.* import android.widget.*
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import app.cash.exhaustive.Exhaustive
import com.frostnerd.dnstunnelproxy.DEFAULT_DNSERVER_CAPABILITIES import com.frostnerd.dnstunnelproxy.DEFAULT_DNSERVER_CAPABILITIES
import com.frostnerd.dnstunnelproxy.DnsServerInformation import com.frostnerd.dnstunnelproxy.DnsServerInformation
import com.frostnerd.dnstunnelproxy.TransportProtocol import com.frostnerd.dnstunnelproxy.TransportProtocol
...@@ -393,7 +392,6 @@ class ServerChoosalDialog( ...@@ -393,7 +392,6 @@ class ServerChoosalDialog(
.setNegativeButton(R.string.all_no) { _, _ -> } .setNegativeButton(R.string.all_no) { _, _ -> }
.setPositiveButton(R.string.all_yes) { _, _ -> .setPositiveButton(R.string.all_yes) { _, _ ->
val type = ServerType.from(layout.spinner.selectedItemPosition) val type = ServerType.from(layout.spinner.selectedItemPosition)
@Exhaustive
when(type) { when(type) {
ServerType.DOH -> { ServerType.DOH -> {
context.getPreferences().removedDefaultDoHServers = context.getPreferences().removedDefaultDoHServers + AbstractHttpsDNSHandle.KNOWN_DNS_SERVERS.keys.find { context.getPreferences().removedDefaultDoHServers = context.getPreferences().removedDefaultDoHServers + AbstractHttpsDNSHandle.KNOWN_DNS_SERVERS.keys.find {
......
...@@ -387,7 +387,7 @@ class MainFragment : Fragment() { ...@@ -387,7 +387,7 @@ class MainFragment : Fragment() {
setOf(it[0], it[1], it[3]) // Google, CF, Quad9 setOf(it[0], it[1], it[3]) // Google, CF, Quad9
} + AbstractTLSDnsHandle.suspendUntilKnownServersArePopulated(1500) { } + AbstractTLSDnsHandle.suspendUntilKnownServersArePopulated(1500) {
setOf(it[1], it[0]) //Quad9, CF setOf(it[1], it[0]) //Quad9, CF
}).mapNotNull { }).filterNotNull().mapNotNull {
DnsSpeedTest( DnsSpeedTest(
context, context,
it as DnsServerInformation<*>, it as DnsServerInformation<*>,
......
...@@ -32,15 +32,13 @@ ext.nexus_user = getNexusUser() ...@@ -32,15 +32,13 @@ ext.nexus_user = getNexusUser()
ext.nexus_password = getNexusPassword() ext.nexus_password = getNexusPassword()
buildscript { buildscript {
ext {
ext.KOTLIN_VERSION = '1.5.10'
}
ext.ANDROID_COMPILE_SDK = (System.getenv("ANDROID_COMPILE_SDK") == null ? 30 : System.getenv("ANDROID_COMPILE_SDK")).toInteger() ext.ANDROID_COMPILE_SDK = (System.getenv("ANDROID_COMPILE_SDK") == null ? 30 : System.getenv("ANDROID_COMPILE_SDK")).toInteger()
ext.ANDROID_TARGET_SDK = (System.getenv("ANDROID_TARGET_SDK") == null ? ANDROID_COMPILE_SDK : System.getenv("ANDROID_TARGET_SDK")).toInteger() ext.ANDROID_TARGET_SDK = (System.getenv("ANDROID_TARGET_SDK") == null ? ANDROID_COMPILE_SDK : System.getenv("ANDROID_TARGET_SDK")).toInteger()
ext.ANDROID_MIN_SDK = (System.getenv("ANDROID_MIN_SDK") == null ? 14 : System.getenv("ANDROID_COMPILE_SDK")).toInteger() ext.ANDROID_MIN_SDK = (System.getenv("ANDROID_MIN_SDK") == null ? 14 : System.getenv("ANDROID_COMPILE_SDK")).toInteger()
ext.KOTLIN_VERSION = System.getenv("KOTLIN_VERSION") == null ? "1.4.21" : System.getenv("KOTLIN_VERSION") ext.ANDROID_GRADLE_PLUGIN_VERSION = System.getenv("ANDROID_GRADLE_PLUGIN_VERSION") == null ? "4.2.1" : System.getenv("ANDROID_GRADLE_PLUGIN_VERSION")
ext.ANDROID_GRADLE_PLUGIN_VERSION = System.getenv("ANDROID_GRADLE_PLUGIN_VERSION") == null ? "3.6.3" : System.getenv("ANDROID_GRADLE_PLUGIN_VERSION")
ext.APPCOMPAT_VERSION = "1.2.0"
ext.COROUTINE_VERSION = "1.3.9"
ext.RECYCLERVIEW_VERSION = "1.1.0"
ext.ROBOELECTRIC_VERSION = "4.3"
println "COMPILE SDK Version: $ANDROID_COMPILE_SDK" println "COMPILE SDK Version: $ANDROID_COMPILE_SDK"
println "TARGET SDK Version: $ANDROID_TARGET_SDK" println "TARGET SDK Version: $ANDROID_TARGET_SDK"
...@@ -48,19 +46,17 @@ buildscript { ...@@ -48,19 +46,17 @@ buildscript {
println "---------------------" println "---------------------"
repositories { repositories {
mavenCentral()
google() google()
jcenter()
maven { maven {
url 'http://storage.googleapis.com/r8-releases/raw' url 'http://storage.googleapis.com/r8-releases/raw'
} }
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.2' classpath "com.android.tools.build:gradle:$ANDROID_GRADLE_PLUGIN_VERSION"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:0.9.18" classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:0.9.18"
classpath 'app.cash.exhaustive:exhaustive-gradle:0.1.1'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
} }
...@@ -70,7 +66,7 @@ allprojects { ...@@ -70,7 +66,7 @@ allprojects {
apply plugin: 'maven-publish' apply plugin: 'maven-publish'
repositories { repositories {
google() google()
jcenter() mavenCentral()
maven { maven {
url 'https://nexus.frostnerd.com/repository/libs-release/' url 'https://nexus.frostnerd.com/repository/libs-release/'
credentials { credentials {
......
...@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME ...@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment