From c84efd301bac95180aa3507a8a9a1c53068c8bb9 Mon Sep 17 00:00:00 2001
From: 562935844@qq.com
Date: 星期五, 15 九月 2023 09:45:03 +0800
Subject: [PATCH] Merge branch 'androidx' of ssh://172.16.1.23:29718/~cjl/HDLSDK_A_Android into androidx
---
HDLSDK/hdl-connect/build.gradle | 28 +++++++++-------------------
1 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/HDLSDK/hdl-connect/build.gradle b/HDLSDK/hdl-connect/build.gradle
index be971ba..5f8c118 100644
--- a/HDLSDK/hdl-connect/build.gradle
+++ b/HDLSDK/hdl-connect/build.gradle
@@ -8,10 +8,9 @@
defaultConfig {
minSdkVersion rootProject.minSdkVersion
targetSdkVersion rootProject.targetSdkVersion
- versionCode 1
- versionName "1.0.1"
+ versionCode 5
+ versionName "1.1.3"
- testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
}
@@ -25,23 +24,14 @@
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
-
- /**
- * 鎵撳寘鑷姩鍛藉悕
- */
- android.libraryVariants.all { variant ->
- variant.outputs.all {
- outputFileName = "hdl-connect-V" + defaultConfig.versionName + ".aar"
- }
- }
}
dependencies {
- api project(path: ':hdl-socket')
- implementation 'androidx.appcompat:appcompat:1.2.0'
- implementation 'com.google.android.material:material:1.3.0'
+// implementation fileTree(include: ['*.jar'], dir: 'libs')
-// //鍔犲瘑
-// implementation 'cn.hutool:hutool-all:5.6.5'
-// implementation 'org.bouncycastle:bcprov-jdk15on:1.60'
-}
\ No newline at end of file
+ api 'com.hdl.hdlhttp:hxhttp:1.0.4'
+ api 'com.squareup.okhttp3:logging-interceptor:4.9.1'
+// embed(name: 'hxhttp_1.0.4_230201',ext: 'aar')
+
+ api 'com.google.code.gson:gson:2.8.8'
+}
--
Gitblit v1.8.0