...
 
Commits (5)
......@@ -3,7 +3,7 @@ apply plugin: 'project-report'
android {
compileSdkVersion 28
buildToolsVersion "28.0.2"
buildToolsVersion "28.0.3"
defaultConfig {
applicationId "com.frostnerd.dnschanger"
......@@ -40,28 +40,28 @@ android {
}
dependencies {
implementation 'com.frostnerd.utils:general:1.0.6'
implementation 'com.frostnerd.utils:general:1.0.7'
implementation 'com.frostnerd.utils:database:1.1.14'
implementation 'com.frostnerd.utils:design:1.0.12'
implementation 'com.frostnerd.utils:materialedittext:1.0.11'
implementation 'com.frostnerd.utils:preferences:2.2.7'
implementation 'com.frostnerd.utils:networking:1.0.3'
implementation 'com.frostnerd.utils:preferenceexport:1.0.7'
implementation 'com.frostnerd.utils:api:1.0.4'
testImplementation 'com.frostnerd.utils:logging:1.0.5'
implementation 'com.frostnerd.utils:design:1.0.14'
implementation 'com.frostnerd.utils:materialedittext:1.0.13'
implementation 'com.frostnerd.utils:preferences:2.2.8'
implementation 'com.frostnerd.utils:networking:1.0.4'
implementation 'com.frostnerd.utils:preferenceexport:1.0.9'
implementation 'com.frostnerd.utils:api:1.0.5'
testImplementation 'com.frostnerd.utils:logging:1.0.7'
implementation "androidx.appcompat:appcompat:1.0.0-rc01"
implementation "androidx.cardview:cardview:1.0.0-rc01"
implementation "androidx.recyclerview:recyclerview:1.0.0-rc01"
implementation "androidx.preference:preference:1.0.0-rc01"
implementation "com.google.android.material:material:1.0.0-rc01"
implementation "androidx.appcompat:appcompat:1.0.0"
implementation "androidx.cardview:cardview:1.0.0"
implementation "androidx.recyclerview:recyclerview:1.0.0"
implementation "androidx.preference:preference:1.0.0"
implementation "com.google.android.material:material:1.0.0"
testImplementation 'junit:junit:4.12'
testImplementation "org.robolectric:robolectric:4.0-alpha-3-SNAPSHOT"
implementation 'com.google.code.gson:gson:2.8.2'
implementation 'com.google.code.gson:gson:2.8.5'
implementation 'org.pcap4j:pcap4j-core:1.7.3'
implementation 'org.pcap4j:pcap4j-packetfactory-static:1.7.3'
implementation 'de.measite.minidns:minidns-core:0.2.4'
implementation 'de.measite.minidns:minidns-hla:0.2.4'
compileOnly 'org.projectlombok:lombok:1.16.20'
annotationProcessor 'org.projectlombok:lombok:1.16.20'
implementation 'de.measite.minidns:minidns-hla:0.3.2'
compileOnly 'org.projectlombok:lombok:1.18.2'
annotationProcessor 'org.projectlombok:lombok:1.18.2'
}
......@@ -3,6 +3,7 @@ package com.frostnerd.dnschanger.activities;
import android.Manifest;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Build;
import android.os.Bundle;
import android.preference.Preference;
......@@ -144,6 +145,11 @@ public class AdvancedSettingsActivity extends AppCompatPreferenceActivity {
findPreference("undo_rule_import").setEnabled(DatabaseHelper.getInstance(this).getCount(DNSRuleImport.class) != 0);
}
@Override
public SharedPreferences getSharedPreferences(String name, int mode) {
return Preferences.getInstance(this);
}
@Override
protected void onDestroy() {
super.onDestroy();
......
......@@ -35,8 +35,8 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.4'
classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.7.1"
classpath 'com.android.tools.build:gradle:3.2.0'
classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.7.5"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
......
......@@ -14,3 +14,5 @@
# org.gradle.parallel=true
#Mon Feb 20 17:13:55 CET 2017
org.gradle.jvmargs=-Xmx1536m
android.enableJetifier=true
android.useAndroidX=true
\ No newline at end of file
......@@ -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-4.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip