Merge pull request #51 from ltttttttttttt/dev

更新版本:kotlin 1.8.20   compose 1.4.0

ComposeViews/build.gradle.kts

@@ -169,6 +169,11 @@ android {
     }
 }
 
+//compose配置
+compose {
+    kotlinCompilerPlugin.set("androidx.compose.compiler:compiler:$composeCompilerVersion")
+}
+
 //publishing {
 //    publications {
 //        create("maven_core", MavenPublication::class) {

README.md

@@ -30,7 +30,8 @@ View demo</a>
 
 <table broder="1">
 <tr><td>ComposeViews version</td><td>jetpack compose version</td><td>compose-multiplatform version</td><td>kotlin version</td></tr>
-<tr><td>current</td><td>1.3.3</td><td>1.3.1</td><td>1.8.10</td></tr>
+<tr><td>current</td><td>1.4.0</td><td>1.4.0</td><td>1.8.20</td></tr>
+<tr><td>1.3.11</td><td>1.3.3</td><td>1.3.1</td><td>1.8.10</td></tr>
 <tr><td>1.3.9.1</td><td>1.3.3</td><td>1.3.0</td><td>1.8.0</td></tr>
 <tr><td>1.3.5</td><td>1.2.1</td><td>1.2.1</td><td>1.7.20</td></tr>
 </table>

README_CN.md

@@ -30,7 +30,8 @@
 
 <table broder="1">
 <tr><td>ComposeViews version</td><td>jetpack compose version</td><td>compose-multiplatform version</td><td>kotlin version</td></tr>
-<tr><td>当前版本</td><td>1.3.3</td><td>1.3.1</td><td>1.8.10</td></tr>
+<tr><td>当前版本</td><td>1.4.0</td><td>1.4.0</td><td>1.8.20</td></tr>
+<tr><td>1.3.11</td><td>1.3.3</td><td>1.3.1</td><td>1.8.10</td></tr>
 <tr><td>1.3.9.1</td><td>1.3.3</td><td>1.3.0</td><td>1.8.0</td></tr>
 <tr><td>1.3.5</td><td>1.2.1</td><td>1.2.1</td><td>1.7.20</td></tr>
 </table>

android_app/src/main/AndroidManifest.xml

@@ -50,7 +50,6 @@
         <activity android:name="com.lt.common_app.SwipeToDismissActivity" />
         <activity android:name="com.lt.common_app.TextPagerIndicatorActivity" />
         <activity android:name="com.lt.common_app.DateSelectorA" />
-        <activity android:name="com.lt.common_app.NestedComposePagerActivity" />
     </application>
 
 </manifest>

buildSrc/src/main/kotlin/Versions.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-const val kotlinVersion = "1.8.10"//kotlin版本
-const val composeVersion = "1.3.1"//compose版本
-const val composeCompilerVersion = "1.4.2"//compose编译版本
+const val kotlinVersion = "1.8.20"//kotlin版本
+const val composeVersion = "1.4.0"//compose版本
+const val composeCompilerVersion = "1.4.5"//compose编译版本
 const val coroutinesVersion = "1.6.4"//协程版本

common_app/build.gradle.kts

@@ -19,7 +19,7 @@ plugins {
     kotlin("multiplatform")
     id("org.jetbrains.compose") version composeVersion
     id("com.android.library")
-    id("com.google.devtools.ksp") version "$kotlinVersion-1.0.9"
+    id("com.google.devtools.ksp") version "$kotlinVersion-1.0.10"
     kotlin("native.cocoapods")
 }
 

common_app/src/commonMain/kotlin/com/lt/common_app/MainActivity.kt

@@ -31,7 +31,6 @@ class MainActivity : BaseComposeActivity() {
     private val buttons = listOf(
         "rv的基础功能" to MainListActivity::class,
         "ViewPager功能" to ComposePagerActivity::class,
-        "NestedComposePager功能" to NestedComposePagerActivity::class,
         "Banner功能" to BannerActivity::class,
         "PagerIndicator功能" to PagerIndicatorActivity::class,
         "TextPagerIndicator功能" to TextPagerIndicatorActivity::class,