From 4bd543430f009e1785cc921e5fe705bb3b7e8d8f Mon Sep 17 00:00:00 2001 From: PeratX <1215714524@qq.com> Date: Mon, 18 Dec 2017 19:37:30 +0800 Subject: [PATCH] Removed several non-updating rule providers --- .travis.yml | 2 +- README.md | 3 --- app/build.gradle | 2 +- app/src/main/java/org/itxtech/daedalus/Daedalus.java | 8 -------- 4 files changed, 2 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4455a75..792b9eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ android: components: - tools - platform-tools - - build-tools-26.0.2 + - build-tools-26.0.3 - android-26 - extra-android-support - extra-google-m2repository diff --git a/README.md b/README.md index ffd15df..c563c36 100644 --- a/README.md +++ b/README.md @@ -53,10 +53,7 @@ DNS Server Providers Rule Providers ------------- * __[hosts](https://github.com/googlehosts/hosts)__ by *[googlehosts](https://github.com/googlehosts)* - [CC BY-NC-SA 4.0](https://creativecommons.org/licenses/by-nc-sa/4.0/deed.zh) -* __[hosts](https://github.com/sy618/hosts)__ by *[sy618](https://github.com/sy618)* - [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/deed.zh) -* __[connector](https://git.oschina.net/lengers/connector)__ by *[lankes](https://git.oschina.net/lengers)* - [GPLv3](https://git.oschina.net/lengers/connector/blob/master/LICENSE) * __[yhosts](https://github.com/vokins/yhosts)__ by *[vokins](https://github.com/vokins)* - [CC BY-NC-ND 4.0](https://creativecommons.org/licenses/by-nc-nd/4.0/) -* __[2017hosts](https://github.com/wangchunming/2017hosts)__ by *[wangchunming](https://github.com/wangchunming)* - None Requirements ------------- diff --git a/app/build.gradle b/app/build.gradle index 64bcfc5..f50a4db 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,7 +4,7 @@ def gitCommit = 'git rev-parse --short HEAD'.execute([], project.rootDir).text.t android { compileSdkVersion 26 - buildToolsVersion "26.0.2" + buildToolsVersion "26.0.3" defaultConfig { applicationId "org.itxtech.daedalus" minSdkVersion 15 diff --git a/app/src/main/java/org/itxtech/daedalus/Daedalus.java b/app/src/main/java/org/itxtech/daedalus/Daedalus.java index 2039054..1dd30be 100644 --- a/app/src/main/java/org/itxtech/daedalus/Daedalus.java +++ b/app/src/main/java/org/itxtech/daedalus/Daedalus.java @@ -63,21 +63,13 @@ public void uncaughtException(Thread t, Throwable e) { //Build-in Hosts rule providers add(new Rule("googlehosts/hosts", "googlehosts.hosts", Rule.TYPE_HOSTS, "https://raw.githubusercontent.com/googlehosts/hosts/master/hosts-files/hosts", false)); - add(new Rule("sy618/hosts", "sy618.hosts", Rule.TYPE_HOSTS, - "https://raw.githubusercontent.com/sy618/hosts/master/FQ", false)); add(new Rule("vokins/yhosts", "vokins.hosts", Rule.TYPE_HOSTS, "https://raw.githubusercontent.com/vokins/yhosts/master/hosts", false)); - add(new Rule("lengers/connector", "connector.hosts", Rule.TYPE_HOSTS, - "https://git.oschina.net/lengers/connector/raw/master/hosts", false)); - add(new Rule("wangchunming/2017hosts", "2017.hosts", Rule.TYPE_HOSTS, - "https://raw.githubusercontent.com/wangchunming/2017hosts/master/hosts-pc", false)); add(new Rule("adaway", "adaway.hosts", Rule.TYPE_HOSTS, "https://adaway.org/hosts.txt", false)); //Build-in DNSMasq rule providers add(new Rule("vokins/yhosts/union", "union.dnsmasq", Rule.TYPE_DNAMASQ, "https://raw.githubusercontent.com/vokins/yhosts/master/dnsmasq/union.conf", false)); - add(new Rule("sy618/hosts/dnsfq", "dnsfq.dnsmasq", Rule.TYPE_DNAMASQ, - "https://raw.githubusercontent.com/sy618/hosts/master/dnsmasq/dnsfq", false)); }}; public static final String[] DEFAULT_TEST_DOMAINS = new String[]{