diff --git a/appbase/build.gradle b/appbase/build.gradle index 1ad2cf5..cf07e1d 100644 --- a/appbase/build.gradle +++ b/appbase/build.gradle @@ -44,8 +44,8 @@ android { } dependencies { - implementation project(':libappbase') - implementation fileTree(dir: 'libs', include: ['*.jar']) + api project(':libappbase') + api fileTree(dir: 'libs', include: ['*.jar']) // SSH implementation 'com.jcraft:jsch:0.1.55' @@ -60,7 +60,6 @@ dependencies { implementation 'com.github.getActivity:ToastUtils:10.5' // 网络连接类库 implementation 'com.squareup.okhttp3:okhttp:4.4.1' - // Android 类库 implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.viewpager:viewpager:1.0.0' diff --git a/appbase/build.properties b/appbase/build.properties index b044c5c..2fdff2f 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Mar 08 02:31:11 HKT 2025 -stageCount=2 +#Sun Mar 09 09:15:39 HKT 2025 +stageCount=6 libraryProject=libappbase baseVersion=2.1 -publishVersion=2.1.1 +publishVersion=2.1.5 buildCount=0 -baseBetaVersion=2.1.2 +baseBetaVersion=2.1.6 diff --git a/build.gradle b/build.gradle index 4d5b285..5c58ec9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { repositories { - // Nexus Maven 库地址 - // "WinBoll Release" - maven { url "https://nexus.winboll.cc/repository/maven-public/" } - // "WinBoll Snapshot" - maven { url "https://nexus.winboll.cc/repository/maven-snapshots/" } - maven { url 'https://maven.aliyun.com/repository/public/' } maven { url 'https://maven.aliyun.com/repository/google/' } maven { url 'https://maven.aliyun.com/repository/gradle-plugin/' } @@ -15,6 +9,13 @@ buildscript { maven { url "https://jitpack.io" } mavenCentral() google() + + // Nexus Maven 库地址 + // "WinBoll Release" + maven { url "https://nexus.winboll.cc/repository/maven-public/" } + // "WinBoll Snapshot" + maven { url "https://nexus.winboll.cc/repository/maven-snapshots/" } + mavenLocal() } dependencies { @@ -26,19 +27,6 @@ buildscript { allprojects { repositories { - // Nexus Maven 库地址 - // "WinBoll Release" - maven { url "https://nexus.winboll.cc/repository/maven-public/" } - // "WinBoll Snapshot" - maven { url "https://nexus.winboll.cc/repository/maven-snapshots/" } - - maven { - url "https://mirrors.tencent.com/repository/maven/tencent_public/" - } - maven { - url "https://mirrors.tencent.com/repository/maven/tencent_public_snapshots" - } - maven { url 'https://maven.aliyun.com/repository/public/' } maven { url 'https://maven.aliyun.com/repository/google/' } maven { url 'https://maven.aliyun.com/repository/gradle-plugin/' } @@ -47,6 +35,13 @@ allprojects { maven { url "https://jitpack.io" } mavenCentral() google() + + // Nexus Maven 库地址 + // "WinBoll Release" + maven { url "https://nexus.winboll.cc/repository/maven-public/" } + // "WinBoll Snapshot" + maven { url "https://nexus.winboll.cc/repository/maven-snapshots/" } + mavenLocal() } ext { diff --git a/libappbase/build.gradle b/libappbase/build.gradle index 1e0359f..2ced735 100644 --- a/libappbase/build.gradle +++ b/libappbase/build.gradle @@ -20,7 +20,7 @@ android { } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) + api fileTree(dir: 'libs', include: ['*.jar']) // SSH implementation 'com.jcraft:jsch:0.1.55' diff --git a/libappbase/build.properties b/libappbase/build.properties index 697cc65..95f4ce3 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Mar 08 02:31:02 HKT 2025 -stageCount=2 +#Sun Mar 09 09:15:24 HKT 2025 +stageCount=6 libraryProject=libappbase baseVersion=2.1 -publishVersion=2.1.1 +publishVersion=2.1.5 buildCount=0 -baseBetaVersion=2.1.2 +baseBetaVersion=2.1.6 diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtils.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtils.java index 7a529a4..a49ea55 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtils.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtils.java @@ -38,7 +38,7 @@ public class LogUtils { static volatile boolean _IsInited = false; static Context _mContext; // 日志显示时间格式 - static SimpleDateFormat mSimpleDateFormat = new SimpleDateFormat("[yyyyMMdd_HHmmSS]", Locale.getDefault()); + static SimpleDateFormat mSimpleDateFormat = new SimpleDateFormat("[yyyyMMdd_HHmmss_SSS]", Locale.getDefault()); // 应用日志文件夹 static File _mfLogCacheDir; static File _mfLogDataDir;