Преглед изворни кода

【组件升级】1.更新组件

hubowen пре 1 година
родитељ
комит
db1d9b3049

+ 10 - 10
app/build.gradle

@@ -123,10 +123,10 @@ dependencies {
 
     //compose依赖
     implementation "androidx.compose.ui:ui:$compose_version"
-    implementation 'androidx.compose.material3:material3:1.0.0-alpha01'
+    implementation 'androidx.compose.material3:material3:1.1.0-rc01'
     implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
-    implementation 'androidx.activity:activity-compose:1.5.1'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
+    implementation 'androidx.activity:activity-compose:1.7.1'
     implementation "androidx.constraintlayout:constraintlayout-compose:1.0.1"
 
     // compose 图片加载
@@ -137,15 +137,15 @@ dependencies {
     implementation "com.google.accompanist:accompanist-insets-ui:0.23.1"
     implementation "com.google.accompanist:accompanist-systemuicontroller:0.23.1"
 
-    implementation "androidx.navigation:navigation-compose:2.5.1"
-    implementation "androidx.compose.runtime:runtime-livedata:1.2.0"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1"
-    implementation 'androidx.appcompat:appcompat:1.5.0'
-    implementation 'com.google.android.material:material:1.6.1'
+    implementation "androidx.navigation:navigation-compose:2.5.3"
+    implementation "androidx.compose.runtime:runtime-livedata:1.4.2"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1"
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.8.0'
 
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
     androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
     debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
     debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version"

+ 4 - 4
build.gradle

@@ -1,16 +1,16 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext {
-        compose_version = '1.2.0'
-        kotlin_version = '1.7.0'
+        compose_version = '1.4.2'
+        kotlin_version = '1.8.10'
     }
 }
 
 plugins {
     id 'com.android.application' version '7.2.0' apply false
     id 'com.android.library' version '7.2.0' apply false
-    id 'org.jetbrains.kotlin.android' version '1.7.0' apply false
-    id 'org.jetbrains.kotlin.jvm' version '1.7.0' apply false
+    id 'org.jetbrains.kotlin.android' version '1.8.10' apply false
+    id 'org.jetbrains.kotlin.jvm' version '1.8.10' apply false
 }
 
 project.ext {

+ 0 - 7
lib_ad_admob/build.gradle

@@ -57,11 +57,4 @@ dependencies {
     implementation project(':lib_ad_core')
 
     api 'com.google.android.gms:play-services-ads:21.5.0'
-
-    implementation 'androidx.core:core-ktx:1.8.0'
-    implementation 'androidx.appcompat:appcompat:1.5.1'
-    implementation 'com.google.android.material:material:1.6.1'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }

+ 5 - 12
lib_ad_applovinmax/build.gradle

@@ -10,11 +10,12 @@ def releaseTime() {
 }
 
 android {
-    compileSdk 33
+    compileSdk = rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
-        minSdk 21
-        targetSdk 33
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -45,16 +46,8 @@ android {
 }
 
 dependencies {
-
     implementation project(':lib_ad_core')
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.appcompat:appcompat:1.5.1'
-    implementation 'com.google.android.material:material:1.6.1'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+
     api 'com.applovin:applovin-sdk:11.6.1'
     api "com.google.android.gms:play-services-ads-identifier:18.0.1"
-
-
 }

+ 8 - 13
lib_ad_core/build.gradle

@@ -54,21 +54,16 @@ android {
 }
 
 dependencies {
-
-    implementation 'androidx.core:core-ktx:1.8.0'
-    implementation 'androidx.appcompat:appcompat:1.5.0'
-    implementation 'com.google.android.material:material:1.6.1'
-
-
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    /*Base*/
+    api 'androidx.appcompat:appcompat:1.6.1'
+    api 'com.google.android.material:material:1.8.0'
     /*Kotlin*/
-    api "androidx.core:core-ktx:1.8.0"
+    api "androidx.core:core-ktx:1.10.0"
     api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     api 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.3'
-    api 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.3'
-    api("androidx.lifecycle:lifecycle-runtime-ktx:2.5.1")
-
-
+    api 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
+    api("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1")
 }

+ 2 - 8
lib_ad_csj/build.gradle

@@ -55,14 +55,8 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
-    compileOnly project(':lib_ad_core')
-    api 'com.pangle.cn:ads-sdk-pro:5.1.0.2'
+    implementation project(':lib_ad_core')
 
+    api 'com.pangle.cn:ads-sdk-pro:5.1.0.2'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.core:core-ktx:1.8.0'
-    implementation 'androidx.appcompat:appcompat:1.5.1'
-    implementation 'com.google.android.material:material:1.6.1'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }

+ 1 - 9
lib_ad_gromore/build.gradle

@@ -63,20 +63,12 @@ dependencies {
 
     implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
 
-    compileOnly project(':lib_ad_core')
+    implementation project(':lib_ad_core')
 
     api "by.gm_mediation.com:gromore-sdk:4.0.0.1"
     api "by.gm_mediation.com:pangle-adapter:5.1.0.2.0"
     api 'com.pangle.cn:ads-sdk-pro:5.1.0.2'
 
-    implementation 'androidx.core:core-ktx:1.8.0'
-    implementation 'androidx.appcompat:appcompat:1.5.1'
-    implementation 'com.google.android.material:material:1.6.1'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-
-
     //mintegral
     api("com.mbridge.msdk.support:videojs:16.3.27")
     api("com.mbridge.msdk.support:mbjscommon:16.3.27")

+ 12 - 12
lib_common/build.gradle

@@ -36,16 +36,16 @@ android {
 }
 
 dependencies {
-    api 'androidx.core:core-ktx:1.8.0'
-    api 'androidx.appcompat:appcompat:1.4.2'
-    api 'com.google.android.material:material:1.6.1'
-    api 'androidx.recyclerview:recyclerview:1.2.1'
+    api 'androidx.core:core-ktx:1.10.0'
+    api 'androidx.appcompat:appcompat:1.6.1'
+    api 'com.google.android.material:material:1.8.0'
+    api 'androidx.recyclerview:recyclerview:1.3.0'
 
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 
-    def kotlin_version = '1.7.0'
+    def kotlin_version = '1.8.10'
     def lifecycle_version = '2.5.1'
     api "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
@@ -67,14 +67,14 @@ dependencies {
     api("androidx.lifecycle:lifecycle-reactivestreams-ktx:$lifecycle_version")
 
     //jetpack navigation
-    api 'androidx.navigation:navigation-fragment-ktx:2.5.1'
-    api 'androidx.navigation:navigation-ui-ktx:2.5.1'
+    api 'androidx.navigation:navigation-fragment-ktx:2.5.3'
+    api 'androidx.navigation:navigation-ui-ktx:2.5.3'
 
     /*Kotlin*/
-    api "androidx.core:core-ktx:1.8.0"
+    api "androidx.core:core-ktx:1.10.0"
     api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     api 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.3'
-    api 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.3'
+    api 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
 
     /*google GA分析*/
     api 'com.google.android.gms:play-services-analytics:18.0.1'
@@ -86,7 +86,7 @@ dependencies {
     /*Logger日志打印*/
     api 'com.orhanobut:logger:2.2.0'
     /*EventBus*/
-    api 'org.greenrobot:eventbus:3.2.0'
+    api 'org.greenrobot:eventbus:3.3.1'
 
     /*Coil图片加载库*/
     api 'io.coil-kt:coil:1.3.2'