diff --git a/app/build.gradle b/app/build.gradle index 1672579..bcd9ff0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ android { // versionName "2.0.1.8"// 正式jiaoguanyi.com 双数正式 单数测试 multiDexEnabled true - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" packagingOptions { exclude 'META-INF/rxjava.properties' } @@ -142,7 +142,7 @@ android { def outputFile = output.outputFile if (outputFile != null) { def fileName = "${appName()}-${variant.versionCode}-V${variant.versionName}-${releaseTime()}-${buildType.name}.apk" - output.outputFileName = new File(outputFile.parent, fileName) + output.outputFileName = fileName } } } @@ -164,7 +164,7 @@ android { def outputFile = "" if (outputFile != null) { def fileName = "${appName()}-${variant.versionCode}-V${variant.versionName}-${releaseTime()}-${productFlavors[0].name}-${buildType.name}.apk" - output.outputFileName = new File(outputFile, fileName) + output.outputFileName = fileName } } @@ -175,12 +175,14 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.android.support:appcompat-v7:26.1.0' - implementation 'com.android.support:recyclerview-v7:26.1.0' - implementation 'com.android.support:cardview-v7:26.1.0' - implementation 'com.android.support:multidex:1.0.1' - implementation 'com.android.support.constraint:constraint-layout:1.1.2' - testImplementation 'junit:junit:4.12' + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'androidx.recyclerview:recyclerview:1.1.0' + implementation 'androidx.cardview:cardview:1.0.0' + implementation 'androidx.multidex:multidex:2.0.1' + implementation 'androidx.constraintlayout:constraintlayout:2.0.4' + implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0' + + testImplementation 'junit:junit:4.13.1' configurations.all { resolutionStrategy.eachDependency { DependencyResolveDetails details -> def requested = details.requested @@ -191,8 +193,8 @@ dependencies { } } } - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.2' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' implementation 'uk.co.chrisjenx:calligraphy:2.3.0' @@ -209,30 +211,30 @@ dependencies { // implementation 'de.greenrobot:eventbus:2.4.1' - implementation 'com.squareup.okhttp3:okhttp:3.10.0' - implementation 'com.squareup.retrofit2:retrofit:2.3.0' - implementation 'com.squareup.retrofit2:converter-gson:2.3.0' - implementation 'com.squareup.retrofit2:adapter-rxjava2:2.3.0' - implementation 'io.reactivex.rxjava2:rxjava:2.0.7' - implementation 'io.reactivex.rxjava2:rxandroid:2.0.1' - implementation 'com.google.code.gson:gson:2.8.0' + implementation 'com.squareup.okhttp3:okhttp:4.6.0' + implementation 'com.squareup.retrofit2:retrofit:2.4.0' + implementation 'com.squareup.retrofit2:converter-gson:2.4.0' + implementation 'com.squareup.retrofit2:adapter-rxjava2:2.4.0' + implementation 'io.reactivex.rxjava2:rxjava:2.2.5' + implementation 'io.reactivex.rxjava2:rxandroid:2.1.0' + implementation 'com.google.code.gson:gson:2.8.6' // implementation 'cn.jiguang:jpush:2.2.0' - implementation 'cn.jiguang.sdk:jpush:3.7.0' // 此处以JPush 3.5.6 版本为例。 - implementation 'cn.jiguang.sdk:jcore:2.4.2' // 此处以JCore 2.2.8 版本为例。 + implementation 'cn.jiguang.sdk:jpush:3.8.6' // 此处以JPush 3.5.6 版本为例。 + implementation 'cn.jiguang.sdk:jcore:2.6.0' // 此处以JCore 2.2.8 版本为例。 implementation "com.github.yjfnypeu:UpdatePlugin:3.0.1" implementation 'com.blankj:utilcode:1.23.7' - implementation 'com.arialyy.aria:core:3.8.5' - annotationProcessor 'com.arialyy.aria:compiler:3.8.5' + implementation 'com.arialyy.aria:core:3.8.15' + annotationProcessor 'com.arialyy.aria:compiler:3.8.15' // implementation 'com.github.tianma8023:NetDetector:v0.2.0' implementation "org.java-websocket:Java-WebSocket:1.4.1" - implementation 'com.google.zxing:core:3.2.1' + implementation 'com.google.zxing:core:3.3.0' implementation 'com.hjq:xxpermissions:6.0' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 808fd7d..75957a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -202,7 +202,7 @@ diff --git a/app/src/main/java/com/mjsheng/myappstore/MyApplication.java b/app/src/main/java/com/mjsheng/myappstore/MyApplication.java index f7cca6f..cb000a6 100644 --- a/app/src/main/java/com/mjsheng/myappstore/MyApplication.java +++ b/app/src/main/java/com/mjsheng/myappstore/MyApplication.java @@ -7,17 +7,13 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.res.Configuration; -import android.net.ConnectivityManager; -import android.net.NetworkInfo; import android.net.Uri; -import android.net.wifi.WifiInfo; -import android.net.wifi.WifiManager; import android.os.Build; import android.os.Handler; import android.os.Looper; import android.os.PowerManager; import android.provider.Settings; -import android.support.multidex.MultiDexApplication; +import androidx.multidex.MultiDexApplication; import android.text.TextUtils; import android.util.Log; @@ -64,9 +60,7 @@ import org.lzh.framework.updatepluginlib.base.UpdateParser; import org.lzh.framework.updatepluginlib.model.CheckEntity; import java.io.File; -import java.io.FileOutputStream; import java.io.IOException; -import java.io.InputStream; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; @@ -81,7 +75,6 @@ import java.util.logging.Level; import cn.jpush.android.api.JPushInterface; import cn.jpush.android.api.JPushMessage; import io.reactivex.Observer; -import io.reactivex.Scheduler; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.Disposable; import io.reactivex.schedulers.Schedulers; diff --git a/app/src/main/java/com/mjsheng/myappstore/Statistics/AppInformation.java b/app/src/main/java/com/mjsheng/myappstore/Statistics/AppInformation.java index 1196c63..91c7f62 100644 --- a/app/src/main/java/com/mjsheng/myappstore/Statistics/AppInformation.java +++ b/app/src/main/java/com/mjsheng/myappstore/Statistics/AppInformation.java @@ -7,7 +7,7 @@ import android.content.pm.PackageManager; import android.graphics.drawable.Drawable; import android.os.Build; import android.os.SystemClock; -import android.support.annotation.RequiresApi; +import androidx.annotation.RequiresApi; public class AppInformation { diff --git a/app/src/main/java/com/mjsheng/myappstore/Statistics/StatisticsInfo.java b/app/src/main/java/com/mjsheng/myappstore/Statistics/StatisticsInfo.java index d0b373a..76a98c1 100644 --- a/app/src/main/java/com/mjsheng/myappstore/Statistics/StatisticsInfo.java +++ b/app/src/main/java/com/mjsheng/myappstore/Statistics/StatisticsInfo.java @@ -6,7 +6,7 @@ import android.app.usage.UsageStats; import android.app.usage.UsageStatsManager; import android.content.Context; import android.os.Build; -import android.support.annotation.RequiresApi; +import androidx.annotation.RequiresApi; import java.util.ArrayList; import java.util.Calendar; diff --git a/app/src/main/java/com/mjsheng/myappstore/activity/HomeActivity.java b/app/src/main/java/com/mjsheng/myappstore/activity/HomeActivity.java index 8bf3bb8..1efded1 100644 --- a/app/src/main/java/com/mjsheng/myappstore/activity/HomeActivity.java +++ b/app/src/main/java/com/mjsheng/myappstore/activity/HomeActivity.java @@ -3,7 +3,7 @@ package com.mjsheng.myappstore.activity; import android.content.Intent; import android.os.Bundle; import android.os.Handler; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import com.mjsheng.myappstore.R; diff --git a/app/src/main/java/com/mjsheng/myappstore/activity/MainActivity.java b/app/src/main/java/com/mjsheng/myappstore/activity/MainActivity.java index 424fe29..2fa24cf 100644 --- a/app/src/main/java/com/mjsheng/myappstore/activity/MainActivity.java +++ b/app/src/main/java/com/mjsheng/myappstore/activity/MainActivity.java @@ -22,8 +22,9 @@ import android.os.PersistableBundle; import android.os.PowerManager; import android.os.SystemClock; import android.provider.Settings; -import android.support.v4.content.LocalBroadcastManager; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + import android.text.TextUtils; import android.util.Log; import android.view.KeyEvent; @@ -69,7 +70,6 @@ import com.mjsheng.myappstore.network.api.DeselectIDApi; import com.mjsheng.myappstore.network.api.ForceDownloadApi; import com.mjsheng.myappstore.network.api.NetAndLaunchApi; import com.mjsheng.myappstore.network.api.SystemSettingApi; -import com.mjsheng.myappstore.server.InitJpushServer; import com.mjsheng.myappstore.server.MyDownloadService; import com.mjsheng.myappstore.utils.ApkUtils; import com.mjsheng.myappstore.utils.Configure; diff --git a/app/src/main/java/com/mjsheng/myappstore/activity/TopActivity.java b/app/src/main/java/com/mjsheng/myappstore/activity/TopActivity.java index 6e944b5..4455689 100644 --- a/app/src/main/java/com/mjsheng/myappstore/activity/TopActivity.java +++ b/app/src/main/java/com/mjsheng/myappstore/activity/TopActivity.java @@ -1,7 +1,7 @@ package com.mjsheng.myappstore.activity; import android.content.Intent; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.view.KeyEvent; diff --git a/app/src/main/java/com/mjsheng/myappstore/bean/BaseResponse.java b/app/src/main/java/com/mjsheng/myappstore/bean/BaseResponse.java index 1c21351..78162e3 100644 --- a/app/src/main/java/com/mjsheng/myappstore/bean/BaseResponse.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/BaseResponse.java @@ -1,6 +1,6 @@ package com.mjsheng.myappstore.bean; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.io.Serializable; diff --git a/app/src/main/java/com/mjsheng/myappstore/network/HTTPInterface.java b/app/src/main/java/com/mjsheng/myappstore/network/HTTPInterface.java index a5768c0..729491f 100644 --- a/app/src/main/java/com/mjsheng/myappstore/network/HTTPInterface.java +++ b/app/src/main/java/com/mjsheng/myappstore/network/HTTPInterface.java @@ -10,7 +10,7 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; import android.provider.Settings; -import android.support.annotation.RequiresApi; +import androidx.annotation.RequiresApi; import android.text.TextUtils; import android.util.Log; diff --git a/app/src/main/java/com/mjsheng/myappstore/server/GuardService.java b/app/src/main/java/com/mjsheng/myappstore/server/GuardService.java index 906cb6a..74517a2 100644 --- a/app/src/main/java/com/mjsheng/myappstore/server/GuardService.java +++ b/app/src/main/java/com/mjsheng/myappstore/server/GuardService.java @@ -19,9 +19,8 @@ import android.net.Network; import android.net.NetworkInfo; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; -import android.os.Build; import android.os.IBinder; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.format.Formatter; import android.util.Log; @@ -34,10 +33,8 @@ import com.arialyy.aria.core.task.DownloadTask; import com.blankj.utilcode.util.LogUtils; import com.lzy.okgo.OkGo; import com.lzy.okgo.callback.StringCallback; -import com.mjsheng.myappstore.BuildConfig; import com.mjsheng.myappstore.KeepAliveConnection; import com.mjsheng.myappstore.MyApplication; -import com.mjsheng.myappstore.activity.MainActivity; import com.mjsheng.myappstore.utils.ApkUtils; import com.mjsheng.myappstore.utils.Configure; import com.mjsheng.myappstore.utils.SPUtils; diff --git a/app/src/main/java/com/mjsheng/myappstore/server/MyDownloadService.java b/app/src/main/java/com/mjsheng/myappstore/server/MyDownloadService.java index 44dfce4..9e31a15 100644 --- a/app/src/main/java/com/mjsheng/myappstore/server/MyDownloadService.java +++ b/app/src/main/java/com/mjsheng/myappstore/server/MyDownloadService.java @@ -10,7 +10,7 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.os.IBinder; import android.provider.Settings; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.Log; import com.lzy.okgo.OkGo; diff --git a/app/src/main/java/com/mjsheng/myappstore/server/StepService.java b/app/src/main/java/com/mjsheng/myappstore/server/StepService.java index d082e1d..d404f10 100644 --- a/app/src/main/java/com/mjsheng/myappstore/server/StepService.java +++ b/app/src/main/java/com/mjsheng/myappstore/server/StepService.java @@ -15,26 +15,18 @@ import android.content.ServiceConnection; import android.os.Binder; import android.os.Handler; import android.os.IBinder; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.Log; import com.blankj.utilcode.util.LogUtils; -import com.lzy.okserver.download.DownloadInfo; import com.mjsheng.myappstore.KeepAliveConnection; -import com.mjsheng.myappstore.MyApplication; -import com.mjsheng.myappstore.bean.AppDateInfo; -import com.mjsheng.myappstore.bean.FileData; import com.mjsheng.myappstore.network.Network; -import com.mjsheng.myappstore.utils.ApkUtils; import com.mjsheng.myappstore.utils.ServiceAliveUtils; import com.mjsheng.myappstore.utils.Utils; import org.java_websocket.handshake.ServerHandshake; import java.net.URI; -import java.nio.file.Path; - -import okhttp3.internal.Util; /** * 主进程 双进程通讯 diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/ApkUtils.java b/app/src/main/java/com/mjsheng/myappstore/utils/ApkUtils.java index 4d7f5e3..89bd5d8 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/ApkUtils.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/ApkUtils.java @@ -17,8 +17,8 @@ import android.net.Uri; import android.os.Binder; import android.os.Build; import android.provider.Settings; -import android.support.annotation.RequiresApi; -import android.support.v4.content.FileProvider; +import androidx.annotation.RequiresApi; +import androidx.core.content.FileProvider; import android.text.TextUtils; import android.util.Log; import android.view.View; @@ -34,9 +34,6 @@ import com.mjsheng.myappstore.R; import com.mjsheng.myappstore.bean.UploadAppInfo; import com.mjsheng.myappstore.network.Network; import com.mjsheng.myappstore.network.api.UploadAppInfoApi; -import com.mjsheng.myappstore.server.InitJpushServer; - -import org.w3c.dom.Text; import java.io.BufferedReader; import java.io.DataOutputStream; diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/InstallResultReceiver.java b/app/src/main/java/com/mjsheng/myappstore/utils/InstallResultReceiver.java index f09fd78..3d74484 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/InstallResultReceiver.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/InstallResultReceiver.java @@ -5,12 +5,9 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageInstaller; import android.os.Build; -import android.support.annotation.RequiresApi; +import androidx.annotation.RequiresApi; import android.util.Log; - -import static android.content.pm.PackageInstaller.STATUS_PENDING_USER_ACTION; - public class InstallResultReceiver extends BroadcastReceiver { private static final String TAG = "InstallResultReceiver"; diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/SaveListUtils.java b/app/src/main/java/com/mjsheng/myappstore/utils/SaveListUtils.java index e785a31..cab82ac 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/SaveListUtils.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/SaveListUtils.java @@ -1,45 +1,18 @@ package com.mjsheng.myappstore.utils; import android.content.Context; -import android.content.Intent; -import android.content.pm.ApplicationInfo; -import android.content.pm.PackageInfo; -import android.content.pm.PackageManager; -import android.net.Uri; -import android.os.Binder; -import android.os.Build; import android.provider.Settings; -import android.support.v4.content.FileProvider; +import androidx.core.content.FileProvider; import android.util.Log; -import android.view.View; -import android.widget.Toast; import com.blankj.utilcode.util.SPStaticUtils; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.mjsheng.myappstore.R; import com.mjsheng.myappstore.comm.CommonDatas; -import com.mjsheng.myappstore.utils.update.ToastTool; -import java.io.BufferedReader; -import java.io.DataOutputStream; -import java.io.File; -import java.io.IOException; -import java.io.InputStreamReader; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import java.lang.reflect.Type; import java.util.ArrayList; -import java.util.Enumeration; import java.util.List; -import java.util.zip.ZipEntry; -import java.util.zip.ZipFile; - -import rx.Observable; -import rx.Observer; -import rx.Subscriber; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; public class SaveListUtils { private static List downLoadList = new ArrayList<>(); diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/SpacesItemDecoration.java b/app/src/main/java/com/mjsheng/myappstore/utils/SpacesItemDecoration.java index e21f825..aee971c 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/SpacesItemDecoration.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/SpacesItemDecoration.java @@ -1,7 +1,7 @@ package com.mjsheng.myappstore.utils; import android.graphics.Rect; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; /** diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/TimeUtils.java b/app/src/main/java/com/mjsheng/myappstore/utils/TimeUtils.java index df9c722..a91e59d 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/TimeUtils.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/TimeUtils.java @@ -2,7 +2,7 @@ package com.mjsheng.myappstore.utils; import android.content.Context; import android.content.Intent; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/Utils.java b/app/src/main/java/com/mjsheng/myappstore/utils/Utils.java index 6c42fcf..a22daa5 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/Utils.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/Utils.java @@ -30,10 +30,9 @@ import android.net.wifi.WifiManager; import android.os.BatteryManager; import android.os.Build; import android.os.Environment; -import android.os.PowerManager; import android.os.StatFs; import android.provider.Settings; -import android.support.annotation.RequiresApi; +import androidx.annotation.RequiresApi; import android.telephony.TelephonyManager; import android.text.TextUtils; import android.text.format.Formatter; diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/update/NotificationDownloadCreator.java b/app/src/main/java/com/mjsheng/myappstore/utils/update/NotificationDownloadCreator.java index 8cecac4..8170066 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/update/NotificationDownloadCreator.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/update/NotificationDownloadCreator.java @@ -3,10 +3,9 @@ package com.mjsheng.myappstore.utils.update; import android.app.Activity; import android.app.NotificationManager; import android.content.Context; -import android.graphics.BitmapFactory; -import android.support.v4.app.NotificationCompat; -import com.mjsheng.myappstore.R; +import androidx.core.app.NotificationCompat; + import com.mjsheng.myappstore.comm.CommonDatas; import org.lzh.framework.updatepluginlib.base.DownloadCallback; diff --git a/app/src/main/res/layout-land/activity_home.xml b/app/src/main/res/layout-land/activity_home.xml index 4d37a6c..c629931 100644 --- a/app/src/main/res/layout-land/activity_home.xml +++ b/app/src/main/res/layout-land/activity_home.xml @@ -1,5 +1,5 @@ - - + diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml index ac4d7fa..69d9aa9 100644 --- a/app/src/main/res/layout-land/activity_main.xml +++ b/app/src/main/res/layout-land/activity_main.xml @@ -1,5 +1,5 @@ - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout-land/activity_top.xml b/app/src/main/res/layout-land/activity_top.xml index fc57a4b..e65de29 100644 --- a/app/src/main/res/layout-land/activity_top.xml +++ b/app/src/main/res/layout-land/activity_top.xml @@ -1,5 +1,5 @@ - - + diff --git a/app/src/main/res/layout-port/activity_home.xml b/app/src/main/res/layout-port/activity_home.xml index c85b09f..bf6a195 100644 --- a/app/src/main/res/layout-port/activity_home.xml +++ b/app/src/main/res/layout-port/activity_home.xml @@ -1,5 +1,5 @@ - - + diff --git a/app/src/main/res/layout-port/activity_main.xml b/app/src/main/res/layout-port/activity_main.xml index a23cc5f..c2fdeba 100644 --- a/app/src/main/res/layout-port/activity_main.xml +++ b/app/src/main/res/layout-port/activity_main.xml @@ -1,5 +1,5 @@ - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout-port/activity_top.xml b/app/src/main/res/layout-port/activity_top.xml index fc57a4b..e65de29 100644 --- a/app/src/main/res/layout-port/activity_top.xml +++ b/app/src/main/res/layout-port/activity_top.xml @@ -1,5 +1,5 @@ - - + diff --git a/build.gradle b/build.gradle index 5edb3bb..ddb2ad7 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.6.4' // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle.properties b/gradle.properties index aac7c9b..9e6fce1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,6 +9,8 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. +android.enableJetifier=true +android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m # When configured, Gradle will run in incubating parallel mode. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b82d541..73c3740 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Jan 06 16:32:58 CST 2021 +#Tue Mar 16 15:27:10 CST 2021 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip diff --git a/local.properties b/local.properties index d44a813..c54b19c 100644 --- a/local.properties +++ b/local.properties @@ -4,5 +4,6 @@ # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -#Mon Feb 01 22:13:27 CST 2021 -sdk.dir=G\:\\AndroidSDK +#Thu Feb 25 11:39:17 CST 2021 +ndk.dir=E\:\\Sdk\\ndk\\android-ndk-r15c +sdk.dir=E\:\\Sdk