From 462aa0cc741b7a611e1bc1f99a8275c71dc42bbf Mon Sep 17 00:00:00 2001 From: Gianlu Date: Sun, 25 Aug 2019 23:05:11 +0200 Subject: [PATCH] Moved CountryFlags to Jitpack --- .gitmodules | 4 ---- Android--Library-Country-Flags | 1 - app/build.gradle | 24 ++++++++++++++---------- settings.gradle | 3 +-- 4 files changed, 15 insertions(+), 17 deletions(-) delete mode 160000 Android--Library-Country-Flags diff --git a/.gitmodules b/.gitmodules index 61d731e56..f1cc71415 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,10 +2,6 @@ path = CommonUtils url = https://github.com/devgianlu/CommonUtils branch = master -[submodule "Android--Library-Country-Flags"] - path = Android--Library-Country-Flags - url = https://github.com/devgianlu/Android--Library-Country-Flags - branch = master [submodule "aria2lib"] path = aria2lib url = https://github.com/devgianlu/aria2lib diff --git a/Android--Library-Country-Flags b/Android--Library-Country-Flags deleted file mode 160000 index adf51efcf..000000000 --- a/Android--Library-Country-Flags +++ /dev/null @@ -1 +0,0 @@ -Subproject commit adf51efcf8a6dc3fc139a61e719254067a4ed021 diff --git a/app/build.gradle b/app/build.gradle index d5ff396c0..abc98d0f6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,16 +73,20 @@ play { } dependencies { - api project(':CommonUtils') - api project(':CountryFlags') - api project(':aria2lib') - api 'androidx.tonyodev.fetch2:xfetch2:3.1.4' - api 'androidx.tonyodev.fetch2okhttp:xfetch2okhttp:3.1.4' - api 'com.squareup.okhttp3:okhttp:4.0.1' - api 'com.github.PhilJay:MPAndroidChart:v3.1.0' - api 'com.getbase:floatingactionbutton:1.10.1' - api 'org.apmem.tools:layouts:1.10@aar' - api 'androidx.documentfile:documentfile:1.0.1' + implementation project(':CommonUtils') + implementation project(':aria2lib') + + implementation 'androidx.tonyodev.fetch2:xfetch2:3.1.4' + implementation 'androidx.tonyodev.fetch2okhttp:xfetch2okhttp:3.1.4' + + implementation 'com.squareup.okhttp3:okhttp:4.1.0' + + implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' + implementation 'com.getbase:floatingactionbutton:1.10.1' + implementation 'org.apmem.tools:layouts:1.10@aar' + implementation 'com.github.devgianlu:Android--Library-Country-Flags:6fc6059f91' + + implementation 'androidx.documentfile:documentfile:1.0.1' } task printVersionName { diff --git a/settings.gradle b/settings.gradle index a4fcb1cd7..9178855c5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,3 @@ -include ':CommonUtils', ':app', ':CountryFlags', ':aria2lib' +include ':CommonUtils', ':app', ':aria2lib' project(':CommonUtils').projectDir = new File('./CommonUtils/utils') -project(':CountryFlags').projectDir = new File('./Android--Library-Country-Flags/countryflags') project(':aria2lib').projectDir = new File('./aria2lib') \ No newline at end of file