From d58a9277ab15ae9130df4d220edfe9883b480b1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 6 Sep 2021 17:13:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7Kotlin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.gradle | 2 ++ foudations/mogo-httpdns/build.gradle | 2 +- foudations/mogo-network/build.gradle | 2 +- gradle.properties | 20 ++++++++++---------- modules/mogo-tanlu/build.gradle | 2 +- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/config.gradle b/config.gradle index 0e07503..5684e3d 100644 --- a/config.gradle +++ b/config.gradle @@ -8,6 +8,8 @@ ext { targetSdkVersion : 22, ] dependencies = [ + kotlinstdlibjdk7 : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlin_version}", + // android androidxappcompat : "androidx.appcompat:appcompat:1.3.1", androidxconstraintlayout : "androidx.constraintlayout:constraintlayout:2.1.0", diff --git a/foudations/mogo-httpdns/build.gradle b/foudations/mogo-httpdns/build.gradle index f9a556c..daf777f 100644 --- a/foudations/mogo-httpdns/build.gradle +++ b/foudations/mogo-httpdns/build.gradle @@ -52,7 +52,7 @@ android { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation rootProject.ext.dependencies.kotlinstdlibjdk7 } apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() \ No newline at end of file diff --git a/foudations/mogo-network/build.gradle b/foudations/mogo-network/build.gradle index 7021111..360cd04 100644 --- a/foudations/mogo-network/build.gradle +++ b/foudations/mogo-network/build.gradle @@ -49,7 +49,7 @@ android { dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation rootProject.ext.dependencies.kotlinstdlibjdk7 api rootProject.ext.dependencies.retrofit api rootProject.ext.dependencies.retrofitadapter diff --git a/gradle.properties b/gradle.properties index 2042394..0d138dc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -36,22 +36,22 @@ PASSWORD=xintai2018 RELEASE=true # AI CLOUD 云平台 # 工具类 -MOGO_UTILS_VERSION=1.1.44 +MOGO_UTILS_VERSION=1.1.45 # 网络请求 -MOGO_NETWORK_VERSION=1.1.44 +MOGO_NETWORK_VERSION=1.1.45 # 网络DNS -MOGO_HTTPDNS_VERSION=1.1.44 +MOGO_HTTPDNS_VERSION=1.1.45 # 鉴权 -MOGO_PASSPORT_VERSION=1.1.44 +MOGO_PASSPORT_VERSION=1.1.45 # 常链接 -MOGO_SOCKET_VERSION=1.1.44 +MOGO_SOCKET_VERSION=1.1.45 # 数据采集 -MOGO_REALTIME_VERSION=1.1.44 +MOGO_REALTIME_VERSION=1.1.45 # 探路,道路事件发布,获取 -MOGO_TANLU_VERSION=1.1.44 +MOGO_TANLU_VERSION=1.1.45 # 直播推流 -MOGO_LIVE_VERSION=1.1.44 +MOGO_LIVE_VERSION=1.1.45 # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.1.44 +MOGO_TRAFFICLIVE_VERSION=1.1.45 # 定位服务 -MOGO_LOCATION_VERSION=1.1.44 +MOGO_LOCATION_VERSION=1.1.45 diff --git a/modules/mogo-tanlu/build.gradle b/modules/mogo-tanlu/build.gradle index 6db1072..b681007 100644 --- a/modules/mogo-tanlu/build.gradle +++ b/modules/mogo-tanlu/build.gradle @@ -28,7 +28,7 @@ android { dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation rootProject.ext.dependencies.kotlinstdlibjdk7 implementation rootProject.ext.dependencies.rxjava implementation rootProject.ext.dependencies.rxandroid