n/nextdns-mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update build env to api 26

Browse Source
This commit is contained in:
PeratX 2017-09-08 18:10:35 +08:00
parent f16789ec97
commit f91bcb26a8
5 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/build.gradle
View File

@ -4,12 +4,12 @@ apply plugin: 'com.google.gms.google-services'
def gitCommit = 'git rev-parse --short HEAD'.execute([], project.rootDir).text.trim() def gitCommit = 'git rev-parse --short HEAD'.execute([], project.rootDir).text.trim()
android { android {
compileSdkVersion 25 compileSdkVersion 26
buildToolsVersion "25.0.3" buildToolsVersion "26.0.1"
defaultConfig { defaultConfig {
applicationId "org.itxtech.daedalus" applicationId "org.itxtech.daedalus"
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 25 targetSdkVersion 26
versionCode 12 versionCode 12
versionName "1.10.1" versionName "1.10.1"
@ -42,17 +42,18 @@ android {
dependencies { dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs') compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.android.support:appcompat-v7:25.3.1' compile 'com.android.support:appcompat-v7:26.0.2'
compile 'com.android.support:design:25.3.1' compile 'com.android.support:design:26.0.2'
compile 'com.android.support:support-v4:25.3.1' compile 'com.android.support:support-v4:26.0.2'
compile 'com.android.support:percent:25.3.1' compile 'com.android.support:percent:26.0.2'
compile 'com.android.support:cardview-v7:25.3.1' compile 'com.android.support:cardview-v7:26.0.2'
compile 'org.pcap4j:pcap4j-core:1.7.1' compile 'org.pcap4j:pcap4j-core:1.7.1'
compile 'org.pcap4j:pcap4j-packetfactory-static:1.7.1' compile 'org.pcap4j:pcap4j-packetfactory-static:1.7.1'
compile 'de.measite.minidns:minidns-core:0.2.2' compile 'de.measite.minidns:minidns-core:0.2.2'
compile 'com.google.code.gson:gson:2.8.1' compile 'com.google.code.gson:gson:2.8.1'
compile 'com.google.firebase:firebase-core:11.0.4'
compile 'com.google.firebase:firebase-crash:11.0.4' compile 'com.google.firebase:firebase-crash:11.0.4'
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'

2
app/src/main/java/org/itxtech/daedalus/Daedalus.java
View File

@ -114,7 +114,7 @@ public class Daedalus extends Application {
initData(); initData();
} }
private void initDirectory(String dir){ private void initDirectory(String dir) {
File directory = new File(dir); File directory = new File(dir);
if (!directory.isDirectory()) { if (!directory.isDirectory()) {
Logger.warning(dir + " is not a directory. Delete result: " + String.valueOf(directory.delete())); Logger.warning(dir + " is not a directory. Delete result: " + String.valueOf(directory.delete()));

3
app/src/main/java/org/itxtech/daedalus/fragment/RulesFragment.java
View File

@ -125,8 +125,7 @@ public class RulesFragment extends ToolbarFragment implements Toolbar.OnMenuItem
if (id == R.id.action_reload) { if (id == R.id.action_reload) {
if (!Daedalus.getPrefs().getBoolean("settings_allow_dynamic_rule_reload", false)) { if (!Daedalus.getPrefs().getBoolean("settings_allow_dynamic_rule_reload", false)) {
Snackbar.make(getView(), R.string.notice_check_dynamic_rule_reload, Snackbar.LENGTH_SHORT) Snackbar.make(getView(), R.string.notice_check_dynamic_rule_reload, Snackbar.LENGTH_SHORT).show();
.setAction("Action", null).show();
} else { } else {
Daedalus.setRulesChanged(); Daedalus.setRulesChanged();
} }

4
app/src/main/java/org/itxtech/daedalus/util/Configurations.java
View File

@ -136,6 +136,10 @@ public class Configurations {
return config; return config;
} }
public Configurations() {
//TODO: Initial config. Eg. Build-in rules
}
public void save() { public void save() {
try { try {
if (file != null) { if (file != null) {

3
build.gradle
View File

@ -16,6 +16,9 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
jcenter() jcenter()
maven {
url 'https://maven.google.com'
}
} }
} }