diff options
| author | cyBerta <cyberta@riseup.net> | 2018-02-06 13:28:30 +0100 |
|---|---|---|
| committer | cyBerta <cyberta@riseup.net> | 2018-02-06 13:29:08 +0100 |
| commit | 7121aeb4fa76cfd8a3de73a0e78ab42ad789f0c7 (patch) | |
| tree | 5585699cf21ab378f87b4b210236ab122c59bd47 | |
| parent | 442c4246870d20a52e6901036fc541b8c7b18785 (diff) | |
8832 code review fixes
| -rw-r--r-- | app/build.gradle | 5 | ||||
| -rw-r--r-- | settings.gradle | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/app/build.gradle b/app/build.gradle index c2a42d3d..9b8b57d0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -47,7 +47,6 @@ android { initWith release applicationIdSuffix ".beta" resValue "string", "app_name", "Bitmask Beta" - matchingFallbacks = ['release'] } debug { testCoverageEnabled = true @@ -131,7 +130,7 @@ configurations.all { config -> } resolutionStrategy.force "com.android.support:support-annotations:27.0.2" resolutionStrategy.force "com.android.support:support-v4:27.0.2" - resolutionStrategy.force "ccom.android.support:support-core-utils:27.0.2" + resolutionStrategy.force "com.android.support:support-core-utils:27.0.2" resolutionStrategy.force "com.android.support:appcompat-v7:27.0.2" resolutionStrategy.force "com.android.support:design:27.0.2" resolutionStrategy.force "com.android.support:support-fragment:27.0.2" @@ -286,7 +285,7 @@ task mergeUntranslatable( type: Copy ) { task copyIcsOpenVPNFiles( type: Copy ) { println "copyIcsOpenVPNFiles" - //copyIcsOpenVPNClasses.execute() + copyIcsOpenVPNClasses.execute() copyIcsOpenVPNXml.execute() copyIcsOpenVPNImages.execute() //mergeUntranslatable.execute() diff --git a/settings.gradle b/settings.gradle index 25c342e6..9d495b34 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1 @@ -include ':app' -//include ':ics-openvpn' -//include ':ics-openvpn:main'
\ No newline at end of file +include ':app'
\ No newline at end of file |