diff --git a/.idea/copyright/GPL_v2_0.xml b/.idea/copyright/GPL_v2_0.xml
index a4dbc29..93d0197 100644
--- a/.idea/copyright/GPL_v2_0.xml
+++ b/.idea/copyright/GPL_v2_0.xml
@@ -1,6 +1,7 @@
+
+
-
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
index d2115fe..05bfbbb 100644
--- a/.idea/copyright/profiles_settings.xml
+++ b/.idea/copyright/profiles_settings.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/animated_vector_drawable_25_3_1.xml b/.idea/libraries/animated_vector_drawable_25_3_1.xml
index 8b3901a..52e2806 100644
--- a/.idea/libraries/animated_vector_drawable_25_3_1.xml
+++ b/.idea/libraries/animated_vector_drawable_25_3_1.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/.idea/libraries/appcompat_v7_25_3_1.xml b/.idea/libraries/appcompat_v7_25_3_1.xml
index 1957b32..6aa24fe 100644
--- a/.idea/libraries/appcompat_v7_25_3_1.xml
+++ b/.idea/libraries/appcompat_v7_25_3_1.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/.idea/libraries/design_25_3_1.xml b/.idea/libraries/design_25_3_1.xml
index fd0eb21..0b42aff 100644
--- a/.idea/libraries/design_25_3_1.xml
+++ b/.idea/libraries/design_25_3_1.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/.idea/libraries/recyclerview_v7_25_3_1.xml b/.idea/libraries/recyclerview_v7_25_3_1.xml
index 0922103..91267f6 100644
--- a/.idea/libraries/recyclerview_v7_25_3_1.xml
+++ b/.idea/libraries/recyclerview_v7_25_3_1.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/.idea/libraries/support_compat_25_3_1.xml b/.idea/libraries/support_compat_25_3_1.xml
index f0c17a4..133c163 100644
--- a/.idea/libraries/support_compat_25_3_1.xml
+++ b/.idea/libraries/support_compat_25_3_1.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/.idea/libraries/support_core_ui_25_3_1.xml b/.idea/libraries/support_core_ui_25_3_1.xml
index 1256d99..478b1ac 100644
--- a/.idea/libraries/support_core_ui_25_3_1.xml
+++ b/.idea/libraries/support_core_ui_25_3_1.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/.idea/libraries/support_core_utils_25_3_1.xml b/.idea/libraries/support_core_utils_25_3_1.xml
index d532c60..8631da7 100644
--- a/.idea/libraries/support_core_utils_25_3_1.xml
+++ b/.idea/libraries/support_core_utils_25_3_1.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/.idea/libraries/support_fragment_25_3_1.xml b/.idea/libraries/support_fragment_25_3_1.xml
index c83a9be..9a76a8e 100644
--- a/.idea/libraries/support_fragment_25_3_1.xml
+++ b/.idea/libraries/support_fragment_25_3_1.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/.idea/libraries/support_media_compat_25_3_1.xml b/.idea/libraries/support_media_compat_25_3_1.xml
index b428962..e873188 100644
--- a/.idea/libraries/support_media_compat_25_3_1.xml
+++ b/.idea/libraries/support_media_compat_25_3_1.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/.idea/libraries/support_v4_25_3_1.xml b/.idea/libraries/support_v4_25_3_1.xml
index 3de29ee..b774128 100644
--- a/.idea/libraries/support_v4_25_3_1.xml
+++ b/.idea/libraries/support_v4_25_3_1.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/.idea/libraries/support_vector_drawable_25_3_1.xml b/.idea/libraries/support_vector_drawable_25_3_1.xml
index 0685884..95b9913 100644
--- a/.idea/libraries/support_vector_drawable_25_3_1.xml
+++ b/.idea/libraries/support_vector_drawable_25_3_1.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/.idea/libraries/transition_25_3_1.xml b/.idea/libraries/transition_25_3_1.xml
index 27c4bc8..98c23cc 100644
--- a/.idea/libraries/transition_25_3_1.xml
+++ b/.idea/libraries/transition_25_3_1.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 5d19981..4a04528 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,8 +1,5 @@
-
-
-
@@ -27,17 +24,7 @@
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c8ca555..8b895a1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -69,125 +69,31 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
@@ -242,34 +148,41 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
@@ -286,11 +199,42 @@
-
+
+
+
+ 3.0
+ 2
+ 2016
+ OnPrefen
+ OnPrefe
+ OnPref
+ OnPre
+ OnPr
+ OnP
+ On
+ C
+ ChangedLis
+ ChangedLi
+ ChangedL
+ Changed
+ Change
+ P
+ Pref
+ Preferen
+ Preference
+ PreferenceCh
+ PreferenceChan
+ PreferenceChang
+ PreferenceChange
+ PreferenceChanged
+ lang
+ PREF_LANGUAGE
+
+
@@ -316,12 +260,12 @@
@@ -2078,15 +1918,8 @@
-
-
-
-
-
-
-
+
-
@@ -2107,9 +1940,8 @@
-
-
-
+
+
@@ -2119,8 +1951,12 @@
-
-
+
+
+
+
+
+
@@ -2130,22 +1966,152 @@
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2166,10 +2132,10 @@
-
+
-
+
@@ -2177,6 +2143,7 @@
+
@@ -2194,6 +2161,18 @@
+
+
+
@@ -2226,7 +2205,6 @@
-
@@ -2260,13 +2238,13 @@
-
-
-
+
-
+
+
+
@@ -2276,7 +2254,6 @@
-
@@ -2310,11 +2287,11 @@
-
-
-
+
-
+
+
+
@@ -2356,6 +2333,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2377,6 +2375,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2413,34 +2436,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2448,7 +2443,6 @@
-
@@ -2482,13 +2476,13 @@
-
-
-
+
-
+
+
+
@@ -2743,30 +2744,32 @@
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
-
-
+
-
-
-
@@ -2774,13 +2777,13 @@
+
-
-
+
-
+
@@ -2832,132 +2835,100 @@
+
+
+ file://$PROJECT_DIR$/app/src/main/java/in/blogspot/anselmbros/torchie/ui/helper/LocaleHelper.java
+ 87
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
+
+
+
-
+
-
-
-
-
+
-
+
-
+
-
+
-
+
@@ -2965,35 +2936,35 @@
-
+
-
+
-
+
-
+
-
+
@@ -3003,40 +2974,40 @@
+
+
+
-
+
-
-
-
-
+
-
+
-
+
-
+
@@ -3044,7 +3015,7 @@
-
+
@@ -3052,135 +3023,189 @@
-
+
-
+
-
+
+
+
+
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
+
+
+
+
+
+
-
-
+
+
+
-
+
-
-
+
+
+
-
+
-
-
+
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
+
-
+
-
-
+
+
+
+
+
+
-
+
-
-
+
+
+
-
-
-
+
+
+
+
+
+
-
+
-
-
-
-
-
-
+
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3188,6 +3213,7 @@
+ GPL v2.0
-
+
@@ -62,13 +62,6 @@
-
-
-
-
-
-
-
@@ -76,30 +69,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/java/in/blogspot/anselmbros/torchie/ui/activity/MainActivity.java b/app/src/main/java/in/blogspot/anselmbros/torchie/ui/activity/MainActivity.java
index 86fafc1..97ebc84 100644
--- a/app/src/main/java/in/blogspot/anselmbros/torchie/ui/activity/MainActivity.java
+++ b/app/src/main/java/in/blogspot/anselmbros/torchie/ui/activity/MainActivity.java
@@ -25,7 +25,6 @@
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.SwitchCompat;
import android.support.v7.widget.Toolbar;
-import android.util.Log;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
@@ -76,27 +75,26 @@ protected void onCreate(Bundle savedInstanceState) {
if (SettingsUtils.isFirstTime(this)) {
this.showDialogWelcome();
}
- Log.e("TAG", "TAG");
}
@Override
protected void onResume() {
super.onResume();
- if (isAccSrvcRunning()) {
+ transAnimButFlash.resetTransition();
+ if (isTorchieQuickServiceRunning()) {
TorchieQuick.getInstance().registerTorchieManagerListener(this);
- this.setFlashButtonStatus(this.isTorchOn());
- } else {
- transAnimButFlash.resetTransition();
+ if (this.isTorchOn()) {
+ this.setFlashButtonStatus(this.isTorchOn());
+ }
}
- sw_func_toggle.setChecked(isAccSrvcRunning());
+ sw_func_toggle.setChecked(isTorchieQuickServiceRunning());
}
@Override
protected void onPause() {
- if (this.isAccSrvcRunning()) {
+ if (this.isTorchieQuickServiceRunning()) {
TorchieQuick.getInstance().unregisterTorchieManagerListener();
- }
- if (this.isTorchOn()) {
+ } else if (this.isTorchOn()) {
this.toggleTorch(null);
}
super.onPause();
@@ -224,15 +222,14 @@ private void setFlashButtonStatus(boolean enabled) {
}
}
- private boolean isAccSrvcRunning() {
+ private boolean isTorchieQuickServiceRunning() {
return TorchieQuick.getInstance() != null;
}
public void toggleTorch(View v) {
- if (isAccSrvcRunning()) {
+ if (isTorchieQuickServiceRunning()) {
TorchieQuick.getInstance().toggleTorch();
} else {
- TorchManager.getInstance(SettingsUtils.getTorchSource(this), true).toggle(this);
TorchManager.getInstance(SettingsUtils.getTorchSource(this), true).setListener(new OutputDeviceListener() {
@Override
public void onStatusChanged(String deviceType, final boolean status) {
@@ -249,11 +246,12 @@ public void onError(String error) {
Toast.makeText(MainActivity.this, error, Toast.LENGTH_SHORT).show();
}
});
+ TorchManager.getInstance(SettingsUtils.getTorchSource(this), true).toggle(this);
}
}
private boolean isTorchOn() {
- if (isAccSrvcRunning()) {
+ if (isTorchieQuickServiceRunning()) {
return TorchieQuick.getInstance().getTorchStatus();
} else {
return TorchManager.getInstance(SettingsUtils.getTorchSource(this), true).getStatus();
diff --git a/app/src/main/java/in/blogspot/anselmbros/torchie/ui/helper/LocaleHelper.java b/app/src/main/java/in/blogspot/anselmbros/torchie/ui/helper/LocaleHelper.java
index 139e7a1..28766f5 100644
--- a/app/src/main/java/in/blogspot/anselmbros/torchie/ui/helper/LocaleHelper.java
+++ b/app/src/main/java/in/blogspot/anselmbros/torchie/ui/helper/LocaleHelper.java
@@ -40,11 +40,21 @@ public static Context onAttach(Context context, String defaultLanguage) {
return setLocale(context, lang);
}
- private static Context setLocale(Context context, String language) {
+ private static Context setLocale(Context context, String languageCode) {
+ String[] languageCodes = languageCode.split("-");
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
- return updateResources(context, language);
+ if (languageCodes.length == 1) {
+ return updateResources(context, languageCodes[0], "");
+ } else {
+ return updateResources(context, languageCodes[0], languageCodes[1]);
+ }
+ } else {
+ if (languageCodes.length == 1) {
+ return updateResourcesLegacy(context, languageCodes[0], "");
+ } else {
+ return updateResourcesLegacy(context, languageCodes[0], languageCodes[1]);
+ }
}
- return updateResourcesLegacy(context, language);
}
private static String getPersistedData(Context context, String defaultLanguage) {
@@ -52,8 +62,13 @@ private static String getPersistedData(Context context, String defaultLanguage)
}
@TargetApi(Build.VERSION_CODES.N)
- private static Context updateResources(Context context, String language) {
- Locale locale = new Locale(language);
+ private static Context updateResources(Context context, String language, String country) {
+ Locale locale;
+ if (country.equals("")) {
+ locale = new Locale(language);
+ } else {
+ locale = new Locale(language, country);
+ }
Locale.setDefault(locale);
Configuration configuration = context.getResources().getConfiguration();
@@ -63,8 +78,13 @@ private static Context updateResources(Context context, String language) {
}
@SuppressWarnings("deprecation")
- private static Context updateResourcesLegacy(Context context, String language) {
- Locale locale = new Locale(language);
+ private static Context updateResourcesLegacy(Context context, String language, String country) {
+ Locale locale;
+ if (country.equals("")) {
+ locale = new Locale(language);
+ } else {
+ locale = new Locale(language, country);
+ }
Locale.setDefault(locale);
Resources resources = context.getResources();
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 94c0e7e..a34b2a0 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -16,59 +16,6 @@
~ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-->
-
-
-
-
- - afrikiečių,af
- - bulgarų,bg
- - čekų,cs
- - vokiečių,de
- - anglų,en
- - ispanų,es
- - estų,et
- - persų,fa
- - prancūzų,fr
- - kroatų,hr
- - vengrų,hu
- - indoneziečių,in
- - italų,it
- - gruzinų,ka
- - Korėjiečių ,ko
- - lietuvių,lt
- - mongolų,mn
- - lenkų,pl
- - portugalų,pt
- - rumunų,ro
- - rusų,ru
- - albanų,sq
- - serbų,sr
- - švedų,sv
- - tamilų,ta
- - Turkų,tr
- - kiniečių,zh
-
-
-
-
-
-
Torchie
Torchie Nustatymai
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..0deb1a6
--- /dev/null
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,97 @@
+
+
+
+ Torchie
+ Torchie设置
+ Torchie Quick
+ 启用\'Torchie Quick\'，仅需按住音量键即可开/关手电
+ @string/permission_warn
+
+ Torchie功能
+ 亮屏
+ 锁屏
+ 关屏
+ 杂项
+ AMOLED显示优化
+ @string/battery_drain_warn
+ 会很耗电
+
+ 捐助
+ 分享
+ 评价
+ 关于
+ 设置
+ 反馈
+ 启用
+ 下次
+ 加载中
+ 选择捐助数目
+ 谢谢！
+ 通过Paypal捐助
+ 确定
+ 继续
+ 撤销
+ 分享
+
+ 仅需按住音量键即可开/关手电，请下载Torchie！
+ 分享Torchie
+
+ 欢迎使用
+ Torchie优化了打开手电的方式！\n\n启用\'Torchie功能\'，仅需按住音量键即可开/关手电！\n\n更多选项在Torchie设置中！
+ 好的
+ 在辅助功能-服务中启用\'Torchie Quick\'才能体验Torchie.
+ 权限说明 - \"监测您输入的文字；监测您的操作\"\nTorchie需要监测实体音量键是否按下，结果被Android错误地当成键盘输入了，想正常使用Torchie就必须启用这些权限
+ \n而且，Torchie没有连网权限，不可能发出任何信息\n\n Torchie不会收集任何信息。乖乖启用Torchie功能吧！ 了解更多
+ 启用Torchie功能？
+
+ Torchie由两兄弟开发\nMerbin J Anselm 和 Rebin J Anselm\nanselmbros@gmail.com\n\n感谢热心的翻译者
+ 了解 Anselm 和 Anselm
+ 访问官方网站
+ 加入测试社区
+ Facebook
+ Google+
+
+ 我们花了很多时间开发Torchie，您的手电才能想开就开！\n您可以捐助我们支持Torchie开发
+ 感谢您的鼓励！\n\n把Torchie分享给朋友吧！
+ 呃...捐助没成功！
+ 继续Paypal？
+
+
+ 一直启用
+ 分
+ 秒
+ 毫秒
+ 振动
+ 选择手电
+ 闪光灯/LED
+ 屏幕背光
+ 开关方式
+ 音量+ 和 音量-
+ 音量+
+ 音量-
+ 按住延迟
+ 立即
+ 关屏将无法工作！
+ 自动关手电
+ 选择语言
+
+ Torchie v%1$s © 2016\n\nTorchie不为使用导致的任何损失承担责任。本程序使用自由软件许可证
+ \nGNU General Public License v2.0\n开放源代码项目 https://github.com/anselm94/torchie-android\n
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d03c81e..1734d03 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -100,7 +100,7 @@
Camera error!
System Language
- Torchie v%1$s © 2016\n\nTorchie comes with absolutely no warranty. This program is free software licensed under
+ Torchie v%1$s © 2017\n\nTorchie comes with absolutely no warranty. This program is free software licensed under
\nGNU General Public License v2.0\nFull source-code is available here https://github.com/anselm94/torchie-android\n
diff --git a/app/src/main/res/values/translators_list.xml b/app/src/main/res/values/translators_list.xml
index 58fe966..66c796c 100644
--- a/app/src/main/res/values/translators_list.xml
+++ b/app/src/main/res/values/translators_list.xml
@@ -44,37 +44,72 @@
24. Afrikaans (Afrikaans) - SniperShotgun@XDA\n
25. български (Bulgarian) - S.Y.@XDA\n
26. 中文 (Chinese) - efni@GitHub\n
+ 27. 简体中文 (Simplified Chinese) - efni@GitHub\n
+ 28. 日本語 (Japanese) - naofum@GitHub\n
+
+ - Afrikaans
+ - български
+ - čeština
+ - Deutsche
+ - English
+ - Español
+ - eesti
+ - فارسی
+ - français
+ - hrvatski
+ - Magyar
+ - bahasa Indonesia
+ - italiano
+ - ქართული
+ - 한국의
+ - Lietuvos
+ - Монгол
+ - Polski
+ - português
+ - român
+ - русский
+ - shqip
+ - српски
+ - svenska
+ - தமிழ்
+ - Türk
+ - 中文
+ - 简体中文
+ - 日本語
+
+
- - Afrikaans,af
- - български,bg
- - čeština,cs
- - Deutsche,de
- - English,en
- - Español,es
- - eesti,et
- - فارسی ,fa
- - français,fr
- - hrvatski,hr
- - Magyar,hu
- - bahasa Indonesia,in
- - italiano,it
- - ქართული,ka
- - 한국의
-,ko
- - Lietuvos,lt
- - Монгол,mn
- - Polski,pl
- - português,pt
- - român,ro
- - русский,ru
- - shqip,sq
- - српски,sr
- - svenska,sv
- - தமிழ்,ta
- - Türk,tr
- - 中文,zh
+ - af
+ - bg
+ - cs
+ - de
+ - en
+ - es
+ - et
+ - fa
+ - fr
+ - hr
+ - hu
+ - in
+ - it
+ - ka
+ - ko
+ - lt
+ - mn
+ - pl
+ - pt
+ - ro
+ - ru
+ - sq
+ - sr
+ - sv
+ - ta
+ - tr
+ - zh
+ - zh-CN
+ - ja
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 89cfb46..b3033f2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.3.3'
+ classpath 'com.android.tools.build:gradle:3.0.0-alpha9'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b1ab85f..3c3b65a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Mar 08 13:46:12 IST 2017
+#Mon Aug 14 12:45:01 IST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-rc-1-all.zip