diff options
| author | Fup Duck <fupduck@sacknagel.com> | 2018-02-08 15:21:55 +0100 |
|---|---|---|
| committer | Fup Duck <fupduck@sacknagel.com> | 2018-02-08 15:21:55 +0100 |
| commit | a14bfd300dccd79dbd3685710e5d8b40b5906a41 (patch) | |
| tree | 996be52accafc408b84d68fc89a6b0731ceed729 /app/build.gradle | |
| parent | ae2813a0fe77c265a42221f6153d8f5bca26a467 (diff) | |
| parent | ae938c20a11b6195936f97eebd32abd35335bceb (diff) | |
Merge branch 'leap_0.9.8' into 8827_handle_switch_provider
Diffstat (limited to 'app/build.gradle')
| -rw-r--r-- | app/build.gradle | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/app/build.gradle b/app/build.gradle index c909b70f..3e4862ca 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -118,6 +118,7 @@ dependencies { implementation 'com.android.support:design:27.0.2' implementation 'com.android.support:support-fragment:27.0.2' implementation 'com.android.support.constraint:constraint-layout:1.0.2' + implementation 'com.android.support:multidex:1.0.2' } // Ensure the no-op dependency is always used in JVM tests. @@ -153,11 +154,6 @@ task copyIcsOpenVPNClasses( type: Copy ) { include '**/LogWindow.java' include '**/LogFragment.java' include '**/SeekBarTicks.java' - include '**/log_window.xml' - include '**/log_fragment.xml' - include '**/log_silders.xml' - include '**/vpnstatus.xml' - include '**/logmenu.xml' include '**/core/**.java' include '**/activities/BaseActivity.java' include '**/APIVpnProfile.java' @@ -181,6 +177,11 @@ task copyIcsOpenVPNClasses( type: Copy ) { task copyIcsOpenVPNXml( type: Copy ) { println "copyIcsOpenVPNXml" from ('../ics-openvpn/main/') { + include '**/log_window.xml' + include '**/log_fragment.xml' + include '**/log_silders.xml' + include '**/vpnstatus.xml' + include '**/logmenu.xml' include '**/strings.xml' include '**/log_*.xml' include '**/vpnstatus.xml' |