diff --git a/AppFrame/build.gradle b/AppFrame/build.gradle index 940396e9..c6be7353 100644 --- a/AppFrame/build.gradle +++ b/AppFrame/build.gradle @@ -15,6 +15,9 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { + debug{ + debuggable true + } release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' diff --git a/AppFrame/src/main/java/com/arialyy/frame/util/AESEncryption.java b/AppFrame/src/main/java/com/arialyy/frame/util/AESEncryption.java index 6a6da25d..f5bcdc79 100644 --- a/AppFrame/src/main/java/com/arialyy/frame/util/AESEncryption.java +++ b/AppFrame/src/main/java/com/arialyy/frame/util/AESEncryption.java @@ -12,7 +12,7 @@ import javax.crypto.spec.SecretKeySpec; /** * AES加密 * - * @author lyy + * author lyy */ public class AESEncryption { /** diff --git a/Aria/build.gradle b/Aria/build.gradle index ea5fe579..c795d6b6 100644 --- a/Aria/build.gradle +++ b/Aria/build.gradle @@ -11,6 +11,9 @@ android { versionName rootProject.ext.versionName } buildTypes { + debug{ + debuggable true + } release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' @@ -24,9 +27,13 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') testImplementation 'junit:junit:4.12' // implementation "androidx.appcompat:appcompat:${rootProject.ext.XAppcompatVersion}" - api project(':AriaAnnotations') + api project(path: ':AriaAnnotations') api project(path: ':PublicComponent') api project(path: ':HttpComponent') } -apply from: 'bintray-release.gradle' \ No newline at end of file +//apply from: 'bintray-release.gradle' +ext{ + PUBLISH_ARTIFACT_ID = 'core' +} +apply from: '../gradle/mavenCentral-release.gradle' \ No newline at end of file diff --git a/Aria/src/main/java/com/arialyy/aria/core/download/DownloadGroupTaskListener.java b/Aria/src/main/java/com/arialyy/aria/core/download/DownloadGroupTaskListener.java index 7184f111..262ac178 100644 --- a/Aria/src/main/java/com/arialyy/aria/core/download/DownloadGroupTaskListener.java +++ b/Aria/src/main/java/com/arialyy/aria/core/download/DownloadGroupTaskListener.java @@ -20,7 +20,7 @@ import com.arialyy.aria.core.task.DownloadGroupTask; /** * @author ChenFei(chenfei0928 @ gmail.com) - * @date 2020-07-07 14:12 + * Date: 2020-07-07 14:12 */ public interface DownloadGroupTaskListener extends NormalTaskListenerInterface { } diff --git a/Aria/src/main/java/com/arialyy/aria/core/download/DownloadReceiver.java b/Aria/src/main/java/com/arialyy/aria/core/download/DownloadReceiver.java index b2e22c96..7766da1d 100644 --- a/Aria/src/main/java/com/arialyy/aria/core/download/DownloadReceiver.java +++ b/Aria/src/main/java/com/arialyy/aria/core/download/DownloadReceiver.java @@ -111,8 +111,8 @@ public class DownloadReceiver extends AbsReceiver { /** * 加载组合任务,用于任务停止、删除等操作 * - * @param taskId 任务id,可从{@link AbsBuilderTarget#create()}、{@link AbsBuilderTarget#add()}、{@link - * * AbsEntity#getId()}读取任务id + * @param taskId 任务id,可从{@link AbsBuilderTarget#create}、{@link AbsBuilderTarget#add}、{@link + * AbsEntity#getId}读取任务id */ public GroupNormalTarget loadGroup(long taskId) { diff --git a/Aria/src/main/java/com/arialyy/aria/core/download/DownloadTaskListener.java b/Aria/src/main/java/com/arialyy/aria/core/download/DownloadTaskListener.java index e00a96c1..84418149 100644 --- a/Aria/src/main/java/com/arialyy/aria/core/download/DownloadTaskListener.java +++ b/Aria/src/main/java/com/arialyy/aria/core/download/DownloadTaskListener.java @@ -19,8 +19,8 @@ import com.arialyy.aria.core.scheduler.NormalTaskListenerInterface; import com.arialyy.aria.core.task.DownloadTask; /** - * @author ChenFei(chenfei0928 @ gmail.com) - * @date 2020-07-07 14:12 + * @author ChenFei(chenfei0928@gmail.com) + * Date: 2020-07-07 14:12 */ public interface DownloadTaskListener extends NormalTaskListenerInterface { } diff --git a/Aria/src/main/java/com/arialyy/aria/core/download/target/DTargetFactory.java b/Aria/src/main/java/com/arialyy/aria/core/download/target/DTargetFactory.java index 693430e4..8e25cbac 100644 --- a/Aria/src/main/java/com/arialyy/aria/core/download/target/DTargetFactory.java +++ b/Aria/src/main/java/com/arialyy/aria/core/download/target/DTargetFactory.java @@ -20,8 +20,8 @@ import com.arialyy.aria.core.common.AbsNormalTarget; import java.util.List; /** - * @Author aria - * @Date 2019-09-05 + * @author aria + * Date: 2019-09-05 */ public class DTargetFactory { diff --git a/Aria/src/main/java/com/arialyy/aria/core/download/target/TcpBuilderTarget.java b/Aria/src/main/java/com/arialyy/aria/core/download/target/TcpBuilderTarget.java index ab9d7212..81f6f9a6 100644 --- a/Aria/src/main/java/com/arialyy/aria/core/download/target/TcpBuilderTarget.java +++ b/Aria/src/main/java/com/arialyy/aria/core/download/target/TcpBuilderTarget.java @@ -20,8 +20,8 @@ import com.arialyy.aria.core.download.DownloadEntity; import com.arialyy.aria.core.wrapper.ITaskWrapper; /** - * @Author aria - * @Date 2019-09-06 + * @author aria + * Date: 2019-09-06 */ public class TcpBuilderTarget extends AbsBuilderTarget { diff --git a/Aria/src/main/java/com/arialyy/aria/core/download/tcp/TcpDelegate.java b/Aria/src/main/java/com/arialyy/aria/core/download/tcp/TcpDelegate.java index 14e689ca..abbf5af5 100644 --- a/Aria/src/main/java/com/arialyy/aria/core/download/tcp/TcpDelegate.java +++ b/Aria/src/main/java/com/arialyy/aria/core/download/tcp/TcpDelegate.java @@ -21,8 +21,8 @@ import com.arialyy.aria.util.ALog; import java.nio.charset.Charset; /** - * @Author aria - * @Date 2019-09-06 + * @author aria + * Date: 2019-09-06 */ public class TcpDelegate extends BaseOption { diff --git a/Aria/src/main/java/com/arialyy/aria/core/download/tcp/TcpTaskConfig.java b/Aria/src/main/java/com/arialyy/aria/core/download/tcp/TcpTaskConfig.java index 58fee361..326ec56b 100644 --- a/Aria/src/main/java/com/arialyy/aria/core/download/tcp/TcpTaskConfig.java +++ b/Aria/src/main/java/com/arialyy/aria/core/download/tcp/TcpTaskConfig.java @@ -18,8 +18,8 @@ package com.arialyy.aria.core.download.tcp; /** * tcp任务配置 * - * @Author aria - * @Date 2019-09-06 + * @author aria + * Date: 2019-09-06 */ public class TcpTaskConfig { diff --git a/Aria/src/main/java/com/arialyy/aria/core/scheduler/TaskInternalListenerInterface.java b/Aria/src/main/java/com/arialyy/aria/core/scheduler/TaskInternalListenerInterface.java index 46d2e45f..c4d73d59 100644 --- a/Aria/src/main/java/com/arialyy/aria/core/scheduler/TaskInternalListenerInterface.java +++ b/Aria/src/main/java/com/arialyy/aria/core/scheduler/TaskInternalListenerInterface.java @@ -19,7 +19,7 @@ package com.arialyy.aria.core.scheduler; * 直接实现监听器回调接口的基类,不对外部直接开放,仅作为内部监听器的父接口使用 * * @author ChenFei(chenfei0928 @ gmail.com) - * @date 2020-07-07 15:18 + * Date: 2020-07-07 15:18 */ public interface TaskInternalListenerInterface { } diff --git a/Aria/src/main/java/com/arialyy/aria/core/upload/UploadTaskListener.java b/Aria/src/main/java/com/arialyy/aria/core/upload/UploadTaskListener.java index 6ba0eaa2..ec734377 100644 --- a/Aria/src/main/java/com/arialyy/aria/core/upload/UploadTaskListener.java +++ b/Aria/src/main/java/com/arialyy/aria/core/upload/UploadTaskListener.java @@ -22,7 +22,7 @@ import com.arialyy.aria.core.task.UploadTask; * 上传任务接口 * * @author ChenFei(chenfei0928 @ gmail.com) - * @date 2020-07-07 13:23 + * Date: 2020-07-07 13:23 */ public interface UploadTaskListener extends NormalTaskListenerInterface { } diff --git a/Aria/src/main/java/com/arialyy/aria/core/upload/target/UTargetFactory.java b/Aria/src/main/java/com/arialyy/aria/core/upload/target/UTargetFactory.java index 42d794c7..64088ac9 100644 --- a/Aria/src/main/java/com/arialyy/aria/core/upload/target/UTargetFactory.java +++ b/Aria/src/main/java/com/arialyy/aria/core/upload/target/UTargetFactory.java @@ -19,8 +19,8 @@ import com.arialyy.aria.core.common.AbsBuilderTarget; import com.arialyy.aria.core.common.AbsNormalTarget; /** - * @Author aria - * @Date 2019-09-05 + * @author aria + * Date: 2019-09-05 */ public class UTargetFactory { diff --git a/AriaAnnotations/build.gradle b/AriaAnnotations/build.gradle index a9f2139b..a77f0adb 100644 --- a/AriaAnnotations/build.gradle +++ b/AriaAnnotations/build.gradle @@ -11,4 +11,9 @@ dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) } -apply from: 'bintray-release.gradle' \ No newline at end of file +//apply from: 'bintray-release.gradle' + +ext{ + PUBLISH_ARTIFACT_ID = 'annotations' +} +apply from: '../gradle/mavenCentral-release.gradle' \ No newline at end of file diff --git a/AriaCompiler/build.gradle b/AriaCompiler/build.gradle index 62aad962..7ad5069d 100644 --- a/AriaCompiler/build.gradle +++ b/AriaCompiler/build.gradle @@ -15,4 +15,8 @@ dependencies { implementation project(':AriaAnnotations') } -apply from: 'bintray-release.gradle' \ No newline at end of file +//apply from: 'bintray-release.gradle' +ext{ + PUBLISH_ARTIFACT_ID = 'compiler' +} +apply from: '../gradle/mavenCentral-release.gradle' \ No newline at end of file diff --git a/DEV_LOG.md b/DEV_LOG.md index 2a036a39..27354c0c 100644 --- a/DEV_LOG.md +++ b/DEV_LOG.md @@ -1,9 +1,10 @@ ## 开发日志 - + v_3.8.16 + + v_3.8.16 (2021/4/18) - 修复单线程下载时,文件已经完成,重复下载回调下载失败的问题 - 修复一个重新下载文件时,同名路径文件没有被被删除的问题 - fix bug https://github.com/AriaLyy/Aria/issues/807 - fix bug https://github.com/AriaLyy/Aria/issues/811 + - fix bug https://github.com/AriaLyy/Aria/issues/851 - 修复组合任务在获取子任务信息的过程中,手动停止或删除,没有回调的问题 + v_3.8.15 (2020/11/9) - 修复不支持断点的连接下载失败问题,https://github.com/AriaLyy/Aria/issues/771 diff --git a/FtpComponent/build.gradle b/FtpComponent/build.gradle index 7767daed..701738be 100644 --- a/FtpComponent/build.gradle +++ b/FtpComponent/build.gradle @@ -15,6 +15,9 @@ android { } buildTypes { + debug{ + debuggable true + } release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' @@ -32,4 +35,8 @@ dependencies { implementation project(path: ':PublicComponent') } -apply from: 'bintray-release.gradle' \ No newline at end of file +//apply from: 'bintray-release.gradle' +ext{ + PUBLISH_ARTIFACT_ID = 'ftp' +} +apply from: '../gradle/mavenCentral-release.gradle' \ No newline at end of file diff --git a/FtpComponent/src/main/java/com/arialyy/aria/ftp/BaseFtpThreadTaskAdapter.java b/FtpComponent/src/main/java/com/arialyy/aria/ftp/BaseFtpThreadTaskAdapter.java index a45dd810..34b6fe4c 100644 --- a/FtpComponent/src/main/java/com/arialyy/aria/ftp/BaseFtpThreadTaskAdapter.java +++ b/FtpComponent/src/main/java/com/arialyy/aria/ftp/BaseFtpThreadTaskAdapter.java @@ -34,8 +34,8 @@ import java.net.UnknownHostException; import javax.net.ssl.SSLContext; /** - * @Author lyy - * @Date 2019-09-18 + * @author lyy + * Date: 2019-09-18 */ public abstract class BaseFtpThreadTaskAdapter extends AbsThreadTaskAdapter { diff --git a/FtpComponent/src/main/java/com/arialyy/aria/ftp/download/FtpDLoaderUtil.java b/FtpComponent/src/main/java/com/arialyy/aria/ftp/download/FtpDLoaderUtil.java index 8d5b5c67..e63ebd41 100644 --- a/FtpComponent/src/main/java/com/arialyy/aria/ftp/download/FtpDLoaderUtil.java +++ b/FtpComponent/src/main/java/com/arialyy/aria/ftp/download/FtpDLoaderUtil.java @@ -25,8 +25,8 @@ import com.arialyy.aria.core.loader.NormalThreadStateManager; import com.arialyy.aria.ftp.FtpTaskOption; /** - * @Author lyy - * @Date 2019-09-19 + * @author lyy + * Date: 2019-09-19 */ public final class FtpDLoaderUtil extends AbsNormalLoaderUtil { diff --git a/FtpComponent/src/main/java/com/arialyy/aria/ftp/download/FtpDRecordHandler.java b/FtpComponent/src/main/java/com/arialyy/aria/ftp/download/FtpDRecordHandler.java index 53f8cf46..43ae5d23 100644 --- a/FtpComponent/src/main/java/com/arialyy/aria/ftp/download/FtpDRecordHandler.java +++ b/FtpComponent/src/main/java/com/arialyy/aria/ftp/download/FtpDRecordHandler.java @@ -27,8 +27,8 @@ import com.arialyy.aria.util.RecordUtil; import java.util.ArrayList; /** - * @Author lyy - * @Date 2019-09-19 + * @author lyy + * Date: 2019-09-19 */ final class FtpDRecordHandler extends RecordHandler { diff --git a/FtpComponent/src/main/java/com/arialyy/aria/ftp/download/FtpDThreadTaskAdapter.java b/FtpComponent/src/main/java/com/arialyy/aria/ftp/download/FtpDThreadTaskAdapter.java index 0c017d68..104c41c5 100644 --- a/FtpComponent/src/main/java/com/arialyy/aria/ftp/download/FtpDThreadTaskAdapter.java +++ b/FtpComponent/src/main/java/com/arialyy/aria/ftp/download/FtpDThreadTaskAdapter.java @@ -32,8 +32,8 @@ import java.nio.channels.FileChannel; import java.nio.channels.ReadableByteChannel; /** - * @Author lyy - * @Date 2019-09-18 + * @author lyy + * Date: 2019-09-18 */ final class FtpDThreadTaskAdapter extends BaseFtpThreadTaskAdapter { diff --git a/FtpComponent/src/main/java/com/arialyy/aria/ftp/download/FtpSubDLoaderUtil.java b/FtpComponent/src/main/java/com/arialyy/aria/ftp/download/FtpSubDLoaderUtil.java index b8470408..63fb8a77 100644 --- a/FtpComponent/src/main/java/com/arialyy/aria/ftp/download/FtpSubDLoaderUtil.java +++ b/FtpComponent/src/main/java/com/arialyy/aria/ftp/download/FtpSubDLoaderUtil.java @@ -25,8 +25,8 @@ import com.arialyy.aria.core.loader.NormalTTBuilder; import com.arialyy.aria.core.loader.SubLoader; /** - * @Author lyy - * @Date 2019-09-28 + * @author lyy + * Date: 2019-09-28 */ final class FtpSubDLoaderUtil extends AbsSubDLoadUtil { /** diff --git a/FtpComponent/src/main/java/com/arialyy/aria/ftp/upload/FtpULoaderUtil.java b/FtpComponent/src/main/java/com/arialyy/aria/ftp/upload/FtpULoaderUtil.java index 232eac2c..757fdb38 100644 --- a/FtpComponent/src/main/java/com/arialyy/aria/ftp/upload/FtpULoaderUtil.java +++ b/FtpComponent/src/main/java/com/arialyy/aria/ftp/upload/FtpULoaderUtil.java @@ -28,8 +28,8 @@ import com.arialyy.aria.core.upload.UTaskWrapper; import com.arialyy.aria.ftp.FtpTaskOption; /** - * @Author lyy - * @Date 2019-09-19 + * @author lyy + * Date: 2019-09-19 */ public final class FtpULoaderUtil extends AbsNormalLoaderUtil { diff --git a/HttpComponent/build.gradle b/HttpComponent/build.gradle index e0fbecc6..d9e3222d 100644 --- a/HttpComponent/build.gradle +++ b/HttpComponent/build.gradle @@ -14,6 +14,9 @@ android { } buildTypes { + debug{ + debuggable true + } release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' @@ -31,4 +34,8 @@ dependencies { implementation project(path: ':PublicComponent') } -apply from: 'bintray-release.gradle' \ No newline at end of file +//apply from: 'bintray-release.gradle' +ext{ + PUBLISH_ARTIFACT_ID = 'http' +} +apply from: '../gradle/mavenCentral-release.gradle' \ No newline at end of file diff --git a/HttpComponent/src/main/java/com/arialyy/aria/http/BaseHttpThreadTaskAdapter.java b/HttpComponent/src/main/java/com/arialyy/aria/http/BaseHttpThreadTaskAdapter.java index 07e81f36..d7e62ef4 100644 --- a/HttpComponent/src/main/java/com/arialyy/aria/http/BaseHttpThreadTaskAdapter.java +++ b/HttpComponent/src/main/java/com/arialyy/aria/http/BaseHttpThreadTaskAdapter.java @@ -20,8 +20,8 @@ import com.arialyy.aria.core.common.SubThreadConfig; import com.arialyy.aria.core.task.AbsThreadTaskAdapter; /** - * @Author lyy - * @Date 2019-09-22 + * @author lyy + * Date: 2019-09-22 */ public abstract class BaseHttpThreadTaskAdapter extends AbsThreadTaskAdapter { protected HttpTaskOption mTaskOption; diff --git a/HttpComponent/src/main/java/com/arialyy/aria/http/ConnectionHelp.java b/HttpComponent/src/main/java/com/arialyy/aria/http/ConnectionHelp.java index f4e42747..f092c915 100644 --- a/HttpComponent/src/main/java/com/arialyy/aria/http/ConnectionHelp.java +++ b/HttpComponent/src/main/java/com/arialyy/aria/http/ConnectionHelp.java @@ -48,8 +48,6 @@ public final class ConnectionHelp { /** * 处理url参数 - * - * @throws MalformedURLException */ public static URL handleUrl(String url, HttpTaskOption taskDelegate) throws MalformedURLException { @@ -127,8 +125,6 @@ public final class ConnectionHelp { /** * 设置头部参数 - * - * @throws ProtocolException */ public static HttpURLConnection setConnectParam(HttpTaskOption delegate, HttpURLConnection conn) { if (delegate.getRequestEnum() == RequestEnum.POST) { diff --git a/HttpComponent/src/main/java/com/arialyy/aria/http/HttpRecordHandler.java b/HttpComponent/src/main/java/com/arialyy/aria/http/HttpRecordHandler.java index aa3d0dea..777a8bf7 100644 --- a/HttpComponent/src/main/java/com/arialyy/aria/http/HttpRecordHandler.java +++ b/HttpComponent/src/main/java/com/arialyy/aria/http/HttpRecordHandler.java @@ -28,8 +28,8 @@ import com.arialyy.aria.util.RecordUtil; import java.util.ArrayList; /** - * @Author lyy - * @Date 2019-09-23 + * @author lyy + * Date: 2019-09-23 */ public final class HttpRecordHandler extends RecordHandler { public HttpRecordHandler(AbsTaskWrapper wrapper) { diff --git a/HttpComponent/src/main/java/com/arialyy/aria/http/download/HttpDLoaderUtil.java b/HttpComponent/src/main/java/com/arialyy/aria/http/download/HttpDLoaderUtil.java index 5feaf9cd..d657c464 100644 --- a/HttpComponent/src/main/java/com/arialyy/aria/http/download/HttpDLoaderUtil.java +++ b/HttpComponent/src/main/java/com/arialyy/aria/http/download/HttpDLoaderUtil.java @@ -29,8 +29,8 @@ import com.arialyy.aria.http.HttpRecordHandler; import com.arialyy.aria.http.HttpTaskOption; /** - * @Author lyy - * @Date 2019-09-21 + * @author lyy + * Date: 2019-09-21 */ public final class HttpDLoaderUtil extends AbsNormalLoaderUtil { diff --git a/HttpComponent/src/main/java/com/arialyy/aria/http/download/HttpSubDLoaderUtil.java b/HttpComponent/src/main/java/com/arialyy/aria/http/download/HttpSubDLoaderUtil.java index 75182bb2..4e9d1c64 100644 --- a/HttpComponent/src/main/java/com/arialyy/aria/http/download/HttpSubDLoaderUtil.java +++ b/HttpComponent/src/main/java/com/arialyy/aria/http/download/HttpSubDLoaderUtil.java @@ -25,8 +25,8 @@ import com.arialyy.aria.core.loader.NormalTTBuilder; import com.arialyy.aria.core.loader.SubLoader; /** - * @Author lyy - * @Date 2019-09-28 + * @author lyy + * Date: 2019-09-28 */ final class HttpSubDLoaderUtil extends AbsSubDLoadUtil { /** diff --git a/HttpComponent/src/main/java/com/arialyy/aria/http/upload/HttpULoaderUtil.java b/HttpComponent/src/main/java/com/arialyy/aria/http/upload/HttpULoaderUtil.java index 145fd92a..f7802d7a 100644 --- a/HttpComponent/src/main/java/com/arialyy/aria/http/upload/HttpULoaderUtil.java +++ b/HttpComponent/src/main/java/com/arialyy/aria/http/upload/HttpULoaderUtil.java @@ -29,8 +29,8 @@ import com.arialyy.aria.http.HttpRecordHandler; import com.arialyy.aria.http.HttpTaskOption; /** - * @Author lyy - * @Date 2019-09-19 + * @author lyy + * Date: 2019-09-19 */ public final class HttpULoaderUtil extends AbsNormalLoaderUtil { diff --git a/M3U8Component/build.gradle b/M3U8Component/build.gradle index 744b384c..834a5421 100644 --- a/M3U8Component/build.gradle +++ b/M3U8Component/build.gradle @@ -15,6 +15,9 @@ android { } buildTypes { + debug{ + debuggable true + } release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' @@ -33,4 +36,8 @@ dependencies { implementation project(path: ':PublicComponent') } -apply from: 'bintray-release.gradle' \ No newline at end of file +//apply from: 'bintray-release.gradle' +ext{ + PUBLISH_ARTIFACT_ID = 'm3u8' +} +apply from: '../gradle/mavenCentral-release.gradle' \ No newline at end of file diff --git a/M3U8Component/src/main/java/com/arialyy/aria/m3u8/IdGenerator.java b/M3U8Component/src/main/java/com/arialyy/aria/m3u8/IdGenerator.java index 8543a82d..40ece721 100644 --- a/M3U8Component/src/main/java/com/arialyy/aria/m3u8/IdGenerator.java +++ b/M3U8Component/src/main/java/com/arialyy/aria/m3u8/IdGenerator.java @@ -7,11 +7,8 @@ public final class IdGenerator { *

* 主要就是三部分: 时间戳,进程id,序列号 时间戳41,id10位,序列号12位 * - * @author chiwei - * @param args * @since JDK 1.6 */ - private static volatile IdGenerator INSTANCE = null; private final static long beginTs = 1483200000000L; diff --git a/M3U8Component/src/main/java/com/arialyy/aria/m3u8/vod/VodRecordHandler.java b/M3U8Component/src/main/java/com/arialyy/aria/m3u8/vod/VodRecordHandler.java index d2a74b5f..cc0d8348 100644 --- a/M3U8Component/src/main/java/com/arialyy/aria/m3u8/vod/VodRecordHandler.java +++ b/M3U8Component/src/main/java/com/arialyy/aria/m3u8/vod/VodRecordHandler.java @@ -31,8 +31,8 @@ import java.io.File; import java.util.ArrayList; /** - * @Author lyy - * @Date 2019-09-24 + * @author lyy + * Date: 2019-09-24 */ final class VodRecordHandler extends RecordHandler { private M3U8TaskOption mOption; diff --git a/PublicComponent/build.gradle b/PublicComponent/build.gradle index 1d3c39d0..bcf9571f 100644 --- a/PublicComponent/build.gradle +++ b/PublicComponent/build.gradle @@ -15,6 +15,9 @@ android { } buildTypes { + debug{ + debuggable true + } release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' @@ -32,4 +35,8 @@ dependencies { testImplementation 'junit:junit:4.12' } -apply from: 'bintray-release.gradle' \ No newline at end of file +//apply from: 'bintray-release.gradle' +ext{ + PUBLISH_ARTIFACT_ID = 'public' +} +apply from: '../gradle/mavenCentral-release.gradle' \ No newline at end of file diff --git a/PublicComponent/src/main/java/com/arialyy/aria/core/TaskOptionParams.java b/PublicComponent/src/main/java/com/arialyy/aria/core/TaskOptionParams.java index 3b85d586..1bac8498 100644 --- a/PublicComponent/src/main/java/com/arialyy/aria/core/TaskOptionParams.java +++ b/PublicComponent/src/main/java/com/arialyy/aria/core/TaskOptionParams.java @@ -38,8 +38,8 @@ import java.util.Map; /** * 任务配置参数 * - * @Author lyy - * @Date 2019-09-10 + * @author lyy + * Date: 2019-09-10 */ public class TaskOptionParams { diff --git a/PublicComponent/src/main/java/com/arialyy/aria/core/common/RecordHelper.java b/PublicComponent/src/main/java/com/arialyy/aria/core/common/RecordHelper.java index 8f2490a1..365663a4 100644 --- a/PublicComponent/src/main/java/com/arialyy/aria/core/common/RecordHelper.java +++ b/PublicComponent/src/main/java/com/arialyy/aria/core/common/RecordHelper.java @@ -29,8 +29,8 @@ import java.io.IOException; /** * 任务记录帮助类,用于处理统一的逻辑 * - * @Author lyy - * @Date 2019-09-19 + * @author lyy + * Date: 2019-09-19 */ public class RecordHelper { private String TAG = CommonUtil.getClassName(getClass()); diff --git a/PublicComponent/src/main/java/com/arialyy/aria/core/inf/IEventHandler.java b/PublicComponent/src/main/java/com/arialyy/aria/core/inf/IEventHandler.java index 560e8410..f2d1628a 100644 --- a/PublicComponent/src/main/java/com/arialyy/aria/core/inf/IEventHandler.java +++ b/PublicComponent/src/main/java/com/arialyy/aria/core/inf/IEventHandler.java @@ -18,8 +18,8 @@ package com.arialyy.aria.core.inf; /** * 事件处理对象 * - * @Author lyy - * @Date 2019-09-10 + * @author lyy + * Date: 2019-09-10 */ public interface IEventHandler { } diff --git a/PublicComponent/src/main/java/com/arialyy/aria/core/inf/IOptionConstant.java b/PublicComponent/src/main/java/com/arialyy/aria/core/inf/IOptionConstant.java index e63ef70b..57321057 100644 --- a/PublicComponent/src/main/java/com/arialyy/aria/core/inf/IOptionConstant.java +++ b/PublicComponent/src/main/java/com/arialyy/aria/core/inf/IOptionConstant.java @@ -16,8 +16,8 @@ package com.arialyy.aria.core.inf; /** - * @Author lyy - * @Date 2019-09-10 + * @author lyy + * Date: 2019-09-10 */ public interface IOptionConstant { // ftp 任务设置常量 diff --git a/PublicComponent/src/main/java/com/arialyy/aria/core/loader/ILoaderAdapter.java b/PublicComponent/src/main/java/com/arialyy/aria/core/loader/ILoaderAdapter.java index 4408dbd8..004d592e 100644 --- a/PublicComponent/src/main/java/com/arialyy/aria/core/loader/ILoaderAdapter.java +++ b/PublicComponent/src/main/java/com/arialyy/aria/core/loader/ILoaderAdapter.java @@ -21,8 +21,8 @@ import com.arialyy.aria.core.wrapper.AbsTaskWrapper; import com.arialyy.aria.core.common.SubThreadConfig; /** - * @Author lyy - * @Date 2019-09-18 + * @author lyy + * Date: 2019-09-18 */ public interface ILoaderAdapter { diff --git a/PublicComponent/src/main/java/com/arialyy/aria/core/loader/IRecordHandler.java b/PublicComponent/src/main/java/com/arialyy/aria/core/loader/IRecordHandler.java index 7f88fc9c..c7c77329 100644 --- a/PublicComponent/src/main/java/com/arialyy/aria/core/loader/IRecordHandler.java +++ b/PublicComponent/src/main/java/com/arialyy/aria/core/loader/IRecordHandler.java @@ -19,8 +19,8 @@ import com.arialyy.aria.core.TaskRecord; import com.arialyy.aria.core.ThreadRecord; /** - * @Author lyy - * @Date 2019-09-18 + * @author lyy + * Date: 2019-09-18 */ public interface IRecordHandler extends ILoaderComponent { diff --git a/PublicComponent/src/main/java/com/arialyy/aria/core/processor/ProxyHandler.java b/PublicComponent/src/main/java/com/arialyy/aria/core/processor/ProxyHandler.java index be6d2c10..a3a8ea3c 100644 --- a/PublicComponent/src/main/java/com/arialyy/aria/core/processor/ProxyHandler.java +++ b/PublicComponent/src/main/java/com/arialyy/aria/core/processor/ProxyHandler.java @@ -21,8 +21,8 @@ import java.lang.reflect.Method; import java.lang.reflect.Proxy; /** - * @Author lyy - * @Date 2019-10-7 + * @author lyy + * Date: 2019-10-7 * 处理器的动态代理 */ public class ProxyHandler implements InvocationHandler { diff --git a/PublicComponent/src/main/java/com/arialyy/aria/core/task/AbsThreadTaskAdapter.java b/PublicComponent/src/main/java/com/arialyy/aria/core/task/AbsThreadTaskAdapter.java index b72dc15c..a58f4c85 100644 --- a/PublicComponent/src/main/java/com/arialyy/aria/core/task/AbsThreadTaskAdapter.java +++ b/PublicComponent/src/main/java/com/arialyy/aria/core/task/AbsThreadTaskAdapter.java @@ -24,8 +24,8 @@ import com.arialyy.aria.util.BandwidthLimiter; import com.arialyy.aria.util.CommonUtil; /** - * @Author lyy - * @Date 2019-09-18 + * @author lyy + * Date: 2019-09-18 */ public abstract class AbsThreadTaskAdapter implements IThreadTaskAdapter { diff --git a/PublicComponent/src/main/java/com/arialyy/aria/core/task/IThreadTask.java b/PublicComponent/src/main/java/com/arialyy/aria/core/task/IThreadTask.java index 1077d357..368db5f3 100644 --- a/PublicComponent/src/main/java/com/arialyy/aria/core/task/IThreadTask.java +++ b/PublicComponent/src/main/java/com/arialyy/aria/core/task/IThreadTask.java @@ -18,8 +18,8 @@ package com.arialyy.aria.core.task; import java.util.concurrent.Callable; /** - * @Author lyy - * @Date 2019-09-18 + * @author lyy + * Date: 2019-09-18 */ public interface IThreadTask extends Callable { diff --git a/PublicComponent/src/main/java/com/arialyy/aria/core/task/IThreadTaskAdapter.java b/PublicComponent/src/main/java/com/arialyy/aria/core/task/IThreadTaskAdapter.java index 1e1a1102..d325f22e 100644 --- a/PublicComponent/src/main/java/com/arialyy/aria/core/task/IThreadTaskAdapter.java +++ b/PublicComponent/src/main/java/com/arialyy/aria/core/task/IThreadTaskAdapter.java @@ -18,8 +18,8 @@ package com.arialyy.aria.core.task; /** * 线程适配器 * - * @Author lyy - * @Date 2019-09-18 + * @author lyy + * Date: 2019-09-18 */ public interface IThreadTaskAdapter { diff --git a/PublicComponent/src/main/java/com/arialyy/aria/core/task/IThreadTaskObserver.java b/PublicComponent/src/main/java/com/arialyy/aria/core/task/IThreadTaskObserver.java index 9460ff7f..ee092e8d 100644 --- a/PublicComponent/src/main/java/com/arialyy/aria/core/task/IThreadTaskObserver.java +++ b/PublicComponent/src/main/java/com/arialyy/aria/core/task/IThreadTaskObserver.java @@ -22,8 +22,8 @@ import com.arialyy.aria.exception.AriaException; /** * 线程任务观察者 * - * @Author lyy - * @Date 2019-09-18 + * @author lyy + * Date: 2019-09-18 */ public interface IThreadTaskObserver { diff --git a/PublicComponent/src/main/java/com/arialyy/aria/util/ComponentUtil.java b/PublicComponent/src/main/java/com/arialyy/aria/util/ComponentUtil.java index 76fd0392..88e51222 100644 --- a/PublicComponent/src/main/java/com/arialyy/aria/util/ComponentUtil.java +++ b/PublicComponent/src/main/java/com/arialyy/aria/util/ComponentUtil.java @@ -34,8 +34,8 @@ import java.util.List; /** * 组件工具,用于跨组件创建对应的工具类 * - * @Author lyy - * @Date 2019-09-23 + * @author lyy + * Date: 2019-09-23 */ public class ComponentUtil { public static final int COMPONENT_TYPE_HTTP = 1; diff --git a/README.md b/README.md index 93342d45..5034c386 100644 --- a/README.md +++ b/README.md @@ -53,11 +53,11 @@ Aria有以下特点: ```java -implementation 'com.arialyy.aria:core:3.8.15' -annotationProcessor 'com.arialyy.aria:compiler:3.8.15' -implementation 'com.arialyy.aria:ftpComponent:3.8.15' # 如果需要使用ftp,请增加该组件 -implementation 'com.arialyy.aria:sftpComponent:3.8.15' # 如果需要使用ftp,请增加该组件 -implementation 'com.arialyy.aria:m3u8Component:3.8.15' # 如果需要使用m3u8下载功能,请增加该组件 +implementation 'me.laoyuyu.aria:core:3.8.16' +annotationProcessor 'me.laoyuyu.aria:compiler:3.8.16' +implementation 'me.laoyuyu.aria:ftp:3.8.16' # 如果需要使用ftp,请增加该组件 +implementation 'me.laoyuyu.aria:sftp:3.8.16' # 如果需要使用ftp,请增加该组件 +implementation 'me.laoyuyu.aria:m3u8:3.8.16' # 如果需要使用m3u8下载功能,请增加该组件 ``` 如果你使用的是kotlin,请使用kotlin官方提供的方法配置apt,[kotlin kapt官方配置传送门](https://www.kotlincn.net/docs/reference/kapt.html) @@ -138,11 +138,13 @@ protected void onCreate(Bundle savedInstanceState) { ### 版本日志 - + v_3.8.15 (2020/11/9) - - 修复不支持断点的连接下载失败问题,https://github.com/AriaLyy/Aria/issues/771 - - 修复iv不存在时,索引文件异常的问题,https://github.com/AriaLyy/Aria/issues/780 - - fix bug https://github.com/AriaLyy/Aria/issues/799 - - fix bug https://github.com/AriaLyy/Aria/issues/798 + + v_3.8.16 + - 修复单线程下载时,文件已经完成,重复下载回调下载失败的问题 + - 修复一个重新下载文件时,同名路径文件没有被被删除的问题 + - fix bug https://github.com/AriaLyy/Aria/issues/807 + - fix bug https://github.com/AriaLyy/Aria/issues/811 + - fix bug https://github.com/AriaLyy/Aria/issues/851 + - 修复组合任务在获取子任务信息的过程中,手动停止或删除,没有回调的问题 [更多版本记录](https://github.com/AriaLyy/Aria/blob/master/DEV_LOG.md) diff --git a/SFtpComponent/build.gradle b/SFtpComponent/build.gradle index 54755e11..66af9f6e 100644 --- a/SFtpComponent/build.gradle +++ b/SFtpComponent/build.gradle @@ -15,6 +15,9 @@ android { } buildTypes { + debug{ + debuggable true + } release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' @@ -34,4 +37,8 @@ dependencies { implementation project(path: ':PublicComponent') } -apply from: 'bintray-release.gradle' +//apply from: 'bintray-release.gradle' +ext{ + PUBLISH_ARTIFACT_ID = 'sftp' +} +apply from: '../gradle/mavenCentral-release.gradle' \ No newline at end of file diff --git a/SFtpComponent/src/main/java/com/arialyy/aria/sftp/download/SFtpDRecordHandler.java b/SFtpComponent/src/main/java/com/arialyy/aria/sftp/download/SFtpDRecordHandler.java index 4cb46605..7a923dd3 100644 --- a/SFtpComponent/src/main/java/com/arialyy/aria/sftp/download/SFtpDRecordHandler.java +++ b/SFtpComponent/src/main/java/com/arialyy/aria/sftp/download/SFtpDRecordHandler.java @@ -27,8 +27,8 @@ import com.arialyy.aria.util.RecordUtil; import java.util.ArrayList; /** - * @Author lyy - * @Date 2019-09-19 + * @author lyy + * Date: 2019-09-19 */ final class SFtpDRecordHandler extends RecordHandler { diff --git a/app/build.gradle b/app/build.gradle index a2e970f6..a317d495 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -30,6 +30,10 @@ android { } buildTypes { + debug { + debuggable true + minifyEnabled false //混淆 + } release { zipAlignEnabled true minifyEnabled true @@ -50,11 +54,6 @@ android { lintOptions { abortOnError false } - - // sourceSets { - // main.kotlin.srcDirs += 'src/main/kotlin' - // main.java.srcDirs += 'src/main/java' - // } } dependencies { diff --git a/app/src/main/res/values/attr.xml b/app/src/main/res/values/attr.xml index f69e48d4..51fee28a 100644 --- a/app/src/main/res/values/attr.xml +++ b/app/src/main/res/values/attr.xml @@ -16,6 +16,6 @@ - + \ No newline at end of file diff --git a/build.gradle b/build.gradle index ed3ff2e5..39e7ddb7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { // ext.kotlin_version = '1.3.20' - ext.kotlin_version = '1.3.41' + ext.kotlin_version = '1.4.30' repositories { jcenter() mavenCentral() @@ -9,12 +9,10 @@ buildscript { maven { url 'https://jitpack.io' } } dependencies { -// classpath 'com.android.tools.build:gradle:2.3.3' -// classpath 'com.android.tools.build:gradle:3.3.2' - classpath 'com.android.tools.build:gradle:3.4.0' - classpath 'com.novoda:bintray-release:0.9.1' -// classpath 'com.novoda:bintray-release:0.9' + classpath 'com.android.tools.build:gradle:4.1.3' +// classpath 'com.novoda:bintray-release:0.9.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}" + classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.4.30" // kotlin 文档引擎 // classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7' // classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' // NOTE: Do not place your application dependencies here; they belong @@ -52,13 +50,26 @@ ext { // publishVersion = '1.0.4' //FTP插件 repoName='maven' // repoName='aria' + desc = 'android 下载框架' website = 'https://github.com/AriaLyy/Aria' licences = ['Apache-2.0'] + // mavenCentral + mavenVersion = '3.8.16' + mavenCentralGroupId = 'me.laoyuyu.aria' + mavenCentralUserID = 'laoyuyu' + mavenCentralUserName = 'laoyuyu' + mavenCentralEmail = '511455842@qq.com' + mavenCentralLicences = 'Apache-2.0' + mavenCentralLicencesURL = 'https://www.apache.org/licenses/LICENSE-2.0' + mavenCentralConnection = 'scm:git:github.com/AriaLyy/Aria.git' + mavenCentralDeveloperConnection = 'scm:git:ssh://github.com/AriaLyy/Aria.git' + mavenCentralTreeURL = 'https://github.com/AriaLyy/KeepassA/tree/master' + compileSdkVersion = 28 supportLibVersion = "27.1.1" - buildToolsVersion = "28.0.3" + buildToolsVersion = "29.0.2" targetSdkVersion = 28 lifecycleVersion = "1.1.1" minSdkVersion = 15 diff --git a/gradle.properties b/gradle.properties index 77a70819..6f79f6b4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,4 +25,7 @@ android.useAndroidX=true android.enableJetifier=true #org.gradle.daemon=true -#org.gradle.jvmargs=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 \ No newline at end of file +#org.gradle.jvmargs=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 +ISLOCAL=false +JAR_PREFIX=aria- +JAR_POSTFIX=core \ No newline at end of file diff --git a/gradle/mavenCentral-release.gradle b/gradle/mavenCentral-release.gradle new file mode 100644 index 00000000..22093bfc --- /dev/null +++ b/gradle/mavenCentral-release.gradle @@ -0,0 +1,216 @@ +apply plugin: 'maven-publish' +apply plugin: 'signing' + +ext { + PUBLISH_GROUP_ID = rootProject.ext.mavenCentralGroupId + PUBLISH_VERSION = rootProject.ext.mavenVersion +} + + +//编译groovy代码时采用 UTF-8 +tasks.withType(GroovyCompile) { + groovyOptions.encoding = "UTF-8" +} +//编译JAVA文件时采用UTF-8 +tasks.withType(JavaCompile) { + options.encoding = "UTF-8" +} + +// java doc 采用utf-8 +// https://docs.gradle.org/current/dsl/org.gradle.api.tasks.javadoc.Javadoc.html#org.gradle.api.tasks.javadoc.Javadoc:options +tasks.withType(Javadoc) { + if(JavaVersion.current().isJava9Compatible()) { + options.addBooleanOption('html5', true) + } + options { + encoding "UTF-8" + charSet 'UTF-8' + links "http://docs.oracle.com/javase/7/docs/api" + addStringOption('Xdoclint:none', '-quiet') // 忽略检查@params 和 @return + } +} + +ext["signing.keyId"] = '' +ext["signing.password"] = '' +ext["signing.secretKeyRingFile"] = '' +ext["ossrhUsername"] = '' +ext["ossrhPassword"] = '' + +File secretPropsFile = project.rootProject.file('local.properties') +if (secretPropsFile.exists()) { + println "Found secret props file, loading props" + Properties p = new Properties() + p.load(new FileInputStream(secretPropsFile)) + p.each { name, value -> + ext[name] = value + } +} else { + println "No props file, loading env vars" +} + +static def localMavenRepo() { + 'file://' + new File(System.getProperty('user.home'), '.m2/repository').absolutePath +} + +def getReleaseRepositoryUrl() { + return isLocal() ? localMavenRepo() + : hasProperty('RELEASE_REPOSITORY_URL') ? RELEASE_REPOSITORY_URL + : 'https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/' +} + +def getSnapshotRepositoryUrl() { + return isLocal() ? localMavenRepo() + : hasProperty('SNAPSHOT_REPOSITORY_URL') ? SNAPSHOT_REPOSITORY_URL + : 'https://s01.oss.sonatype.org/content/repositories/snapshots/' +} + +def isLocal(){ + return ISLOCAL == 'true' +} + +afterEvaluate { project -> + if (isLocal()) { + println("上传到本地仓库") + } else { + println("上传到中央仓库") + } + publishing { + def isAndroidProject = project.plugins.hasPlugin('com.android.application') || project. + plugins. + hasPlugin('com.android.library') + publications { + release(MavenPublication) { + // groupId 等信息 + groupId PUBLISH_GROUP_ID + artifactId PUBLISH_ARTIFACT_ID + version PUBLISH_VERSION + + if (isAndroidProject) { + // 移除R文件,移除BuildConfig文件 + generateReleaseBuildConfig.enabled = false + generateDebugBuildConfig.enabled = false + generateReleaseResValues.enabled = false + generateDebugResValues.enabled = false + // 使用了这个组件,就不需要自己aar、pom.withxml了 + from components.release + + def variants = project.android.libraryVariants.findAll { + it.buildType.name.equalsIgnoreCase('debug') + } + + def getAndroidSdkDirectory = project.android.sdkDirectory + + def getAndroidJar = "${getAndroidSdkDirectory}/platforms/${project.android.compileSdkVersion}/android.jar" + + task androidJavadocs(type: Javadoc, dependsOn: assembleDebug) { + println("开始打包aar") + source = variants.collect { it.getJavaCompileProvider().get().source } + classpath = files( + getAndroidJar, + project.file("build/intermediates/classes/debug") + ) + doFirst { + classpath += files(variants.collect { it.javaCompile.classpath.files }) + } + options { + links("http://docs.oracle.com/javase/7/docs/api/") + linksOffline("http://d.android.com/reference", + "${getAndroidSdkDirectory}/docs/reference") + encoding "UTF-8" + charSet 'UTF-8' + addStringOption('Xdoclint:none', '-quiet') // 忽略检查@params 和 @return + } + + exclude '**/R.java' + exclude "**/BuildConfig.class" + } + + def cleanJavadocTask = task("cleanJavadocTask", type: Delete) { + delete androidJavadocs.destinationDir + } as Task + project.clean.dependsOn(cleanJavadocTask) + + task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) { + classifier = 'javadoc' + from androidJavadocs.destinationDir + baseName "${JAR_PREFIX}${project.name}" + } + + task androidSourcesJar(type: Jar) { + classifier = 'sources' + from project.android.sourceSets.main.java.source + baseName "${JAR_PREFIX}${project.name}" + + exclude "**/R.class" + exclude "**/BuildConfig.class" + } + + task androidLibraryJar(type: Jar, dependsOn: compileDebugJavaWithJavac + /* == variant.javaCompile */) { + // java 编译后的 class文件, build/intermediates/classes/debug/ + from compileDebugJavaWithJavac.destinationDir + // kotlin 编译后的 class文件 + from 'build/tmp/kotlin-classes/debug/' + // 指定需要被打包成 jar 的文件夹 + // include('libs/**') + exclude '**/R.class' + exclude '**/R$*.class' + exclude "**/BuildConfig.class" + baseName "${JAR_PREFIX}${project.name}-cache" + } + + artifact androidLibraryJar + artifact androidSourcesJar + artifact androidJavadocsJar + + } else if (project.plugins.hasPlugin('java')) { + from components.java + } + + pom { + name = PUBLISH_ARTIFACT_ID + description = rootProject.ext.desc + url = rootProject.ext.website + licenses { + license { + //协议类型,一般默认Apache License2.0的话不用改: + name = rootProject.ext.mavenCentralLicences + url = rootProject.ext.mavenCentralLicencesURL + } + } + developers { + developer { + id = rootProject.ext.mavenCentralUserID + name = rootProject.ext.mavenCentralUserName + email = rootProject.ext.mavenCentralEmail + } + } + scm { + //修改成你的Git地址: + connection = rootProject.ext.mavenCentralConnection + developerConnection = rootProject.ext.mavenCentralDeveloperConnection + //分支地址: + url = rootProject.ext.mavenCentralTreeURL + } + } + } + } + repositories { + maven { + name = "mavencentral" + + def releasesRepoUrl = getReleaseRepositoryUrl() + def snapshotsRepoUrl = getSnapshotRepositoryUrl() + url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl + + credentials { + username ossrhUsername + password ossrhPassword + } + } + } + } + signing { + sign publishing.publications + } +} diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 440edac9..6cbf6275 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -4,4 +4,5 @@ distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists #distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +#distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip