From 2ce8fd2e0e80e35cffbfbc43c409d2c90827d60a Mon Sep 17 00:00:00 2001 From: zhujiang2 Date: Mon, 29 Mar 2021 11:03:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/zj/test/BannerTest.kt | 4 +--- banner/build.gradle | 16 ++++++++-------- build.gradle | 4 ++-- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/zj/test/BannerTest.kt b/app/src/main/java/com/zj/test/BannerTest.kt index 0ba8b1f..7d0bd10 100644 --- a/app/src/main/java/com/zj/test/BannerTest.kt +++ b/app/src/main/java/com/zj/test/BannerTest.kt @@ -1,19 +1,17 @@ package com.zj.test import android.widget.Toast -import androidx.compose.foundation.gestures.scrollable import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.runtime.Composable -import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.unit.dp -import com.zj.banner.model.BaseBannerBean import com.zj.banner.BannerPager +import com.zj.banner.model.BaseBannerBean import com.zj.banner.ui.indicator.BannerGravity import com.zj.banner.ui.indicator.CircleIndicator import com.zj.banner.ui.indicator.NumberIndicator diff --git a/banner/build.gradle b/banner/build.gradle index 7bbbd60..f07fad6 100644 --- a/banner/build.gradle +++ b/banner/build.gradle @@ -36,7 +36,7 @@ android { } composeOptions { kotlinCompilerExtensionVersion compose_version - kotlinCompilerVersion '1.4.30' + kotlinCompilerVersion '1.4.31' } } @@ -44,20 +44,20 @@ dependencies { implementation 'androidx.core:core-ktx:1.3.2' implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'com.google.android.material:material:1.2.1' + implementation 'com.google.android.material:material:1.3.0' implementation "androidx.compose.ui:ui:$compose_version" implementation "androidx.compose.material:material:$compose_version" implementation "androidx.compose.ui:ui-tooling:$compose_version" - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.0-alpha06' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.0' - implementation "dev.chrisbanes.accompanist:accompanist-coil:0.6.0" - implementation "dev.chrisbanes.accompanist:accompanist-insets:0.6.0" - implementation 'androidx.activity:activity-compose:1.3.0-alpha02' + implementation "dev.chrisbanes.accompanist:accompanist-coil:0.6.2" + implementation "dev.chrisbanes.accompanist:accompanist-insets:0.6.2" + implementation 'androidx.activity:activity-compose:1.3.0-alpha04' - implementation "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha02" + implementation "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha03" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$compose_version" implementation "androidx.compose.runtime:runtime-livedata:$compose_version" - testImplementation 'junit:junit:4.+' + testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version" diff --git a/build.gradle b/build.gradle index 4caff2b..ac2aa71 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 { - compose_version = '1.0.0-beta01' + compose_version = '1.0.0-beta02' } repositories { google() @@ -9,7 +9,7 @@ buildscript { } dependencies { classpath "com.android.tools.build:gradle:7.0.0-alpha12" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.30" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files