compose version 1.7.6

saied89 · Dec 25, 2024 · 233be56 · 233be56
1 parent 5a3f833
commit 233be56
Show file tree

Hide file tree

Showing 17 changed files with 161 additions and 57 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,16 +1,14 @@
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.compose.compiler)
     alias(libs.plugins.gms)
     alias(libs.plugins.firebase.crashlytics)
 }
 
-val compose_version: String by project
-val material3_version: String by project
-
 android {
     namespace = "home.saied.composesamples"
-    compileSdk = 34
+    compileSdk = 35
 
     signingConfigs {
         create("release") {
@@ -30,9 +28,9 @@ android {
     defaultConfig {
         applicationId = "home.saied.composesamples"
         minSdk = 21
-        targetSdk = 34
-        versionCode = 17
-        versionName = "0.3.4"
+        targetSdk = 35
+        versionCode = 18
+        versionName = "0.3.7"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -41,7 +39,7 @@ android {
         buildConfigField(
             "String",
             "composeVersion",
-            "\"${libs.versions.compose.asProvider().get()}\""
+            "\"${libs.versions.compose.get()}\""
         )
         buildConfigField(
             "String",
@@ -75,9 +73,6 @@ android {
         buildConfig = true
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-    }
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,28 +1,27 @@
 [versions]
-androidx-junit = "1.1.5"
-core-ktx = "1.12.0"
-compose = "1.6.0"
+androidx-junit = "1.2.1"
+core-ktx = "1.15.0"
+compose = "1.7.6"
 junit = "4.13.2"
-material = "1.11.0"
-material3 = "1.2.0-alpha12"
-firebase = "32.3.1"
+material = "1.12.0"
+material3 = "1.3.1"
+firebase = "33.7.0"
 accompanist = "0.31.5-beta"
-coroutines = "1.7.2"
-espresso-core = "3.5.1"
-agp = "8.1.4"
-kotlin = "1.9.22"
-ksp = "1.9.22-1.0.17"
-lifecycle = "2.7.0"
-navigation = "2.7.6"
-paging = "3.2.1"
-compose-compiler = "1.5.8"
-firebaseCrashlyticsPlugin = "2.9.9"
-gmsPlugin = "4.4.0"
+coroutines = "1.7.3"
+espresso-core = "3.6.1"
+agp = "8.7.3"
+kotlin = "2.0.21"
+ksp = "2.0.21-1.0.28"
+lifecycle = "2.8.7"
+navigation = "2.8.5"
+paging = "3.3.5"
+firebaseCrashlyticsPlugin = "3.0.2"
+gmsPlugin = "4.4.2"
 
 [libraries]
 android-core = { module = "androidx.core:core-ktx", version.ref = "core-ktx" }
-android-appCompat = { module = "androidx.appcompat:appcompat", version = "1.6.1" }
-activity-compose = { module = "androidx.activity:activity-compose", version = "1.8.0" }
+android-appCompat = { module = "androidx.appcompat:appcompat", version = "1.7.0" }
+activity-compose = { module = "androidx.activity:activity-compose", version = "1.9.3" }
 ext-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-junit" }
 junit = { module = "junit:junit", version.ref = "junit" }
 material = { module = "com.google.android.material:material", version.ref = "material" }
@@ -48,7 +47,7 @@ firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "fir
 firebase-analytics = { module = "com.google.firebase:firebase-analytics-ktx" }
 firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics-ktx" }
 accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" }
-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
+coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
 coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
 espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso-core" }
 ksp-api = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" }
@@ -63,6 +62,8 @@ android-application = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+jetbrains-intellij = { id = "org.jetbrains.intellij", version = "1.17.4" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 kotlinx-serialization-plugin = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebaseCrashlyticsPlugin" }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Dec 11 00:42:39 IRST 2021
+#Wed Dec 25 18:54:24 CET 2024
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/ideaplugin/build.gradle.kts b/ideaplugin/build.gradle.kts
@@ -1,7 +1,9 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id("java-library")
-    id("org.jetbrains.kotlin.jvm")
-    id("org.jetbrains.intellij") version "1.15.0"
+    alias(libs.plugins.kotlin.jvm)
+    alias(libs.plugins.jetbrains.intellij)
 }
 
 repositories {
@@ -22,7 +24,7 @@ tasks {
         targetCompatibility = "17"
     }
     withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-        kotlinOptions.jvmTarget = "17"
+        compilerOptions.jvmTarget.set(JvmTarget.JVM_17)
     }
 
     patchPluginXml {
@@ -39,4 +41,8 @@ tasks {
     publishPlugin {
         token.set(System.getenv("PUBLISH_TOKEN"))
     }
+}
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
 }
diff --git a/processor/build.gradle.kts b/processor/build.gradle.kts
@@ -1,5 +1,3 @@
-val kspVersion: String by project
-
 plugins {
     kotlin("jvm")
 }

diff --git a/samples/build.gradle.kts b/samples/build.gradle.kts
@@ -1,13 +1,14 @@
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.compose.compiler)
     alias(libs.plugins.kotlinx.serialization.plugin)
     id ("kotlin-parcelize")
     alias(libs.plugins.ksp)
 }
 
 android {
-    compileSdk = 33
+    compileSdk = 35
 
     defaultConfig {
         minSdk = 21
@@ -24,21 +25,14 @@ android {
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
+        kotlinOptions.freeCompilerArgs += "-Xcontext-receivers"
     }
     kotlinOptions {
         jvmTarget = "17"
     }
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-    }
-//    packagingOptions {
-//        resources {
-//            excludes += "/META-INF/{AL2.0,LGPL2.1}"
-//        }
-//    }
     namespace = "home.saied.samples"
     kotlin {
         this@android.sourceSets {