Upgrade: Compose : 1.2.0 (#45)

* Upgraded to Compose 1.2.0
hi-manshu · Jul 29, 2022 · 0bfa285 · 0bfa285
1 parent 6c222c0
commit 0bfa285
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 18 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -50,7 +50,7 @@ android {
 }
 
 dependencies {
-//    implementation(project(":kalendar"))
+    implementation(project(":kalendar"))
 //    implementation("com.himanshoe:kalendar:endlos:1.0.0-alpha1")
 //    implementation("com.himanshoe:kalendar-endlos:1.0.0-alpha1")
     implementation(project(mapOf("path" to ":kalendar-endlos")))

diff --git a/app/src/main/java/com/himanshoe/sample/MainActivity.kt b/app/src/main/java/com/himanshoe/sample/MainActivity.kt
@@ -3,11 +3,10 @@ package com.himanshoe.sample
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import com.himanshoe.kalendar.endlos.common.KalendarKonfig
-import com.himanshoe.kalendar.endlos.common.data.EventType
-import com.himanshoe.kalendar.endlos.common.data.KalendarEvent
-import com.himanshoe.kalendar.endlos.ui.Kalendar
-import java.time.DayOfWeek
+import com.himanshoe.kalendar.common.KalendarKonfig
+import com.himanshoe.kalendar.common.data.KalendarEvent
+import com.himanshoe.kalendar.ui.Kalendar
+import com.himanshoe.kalendar.ui.KalendarType
 import java.time.LocalDate
 
 class MainActivity : ComponentActivity() {
@@ -20,16 +19,16 @@ class MainActivity : ComponentActivity() {
                         LocalDate.now().plusDays(3),
                         "",
                         "",
-                        EventType.Goal
+
                     )
                 ),
                 kalendarKonfig = KalendarKonfig(
                     weekCharacters = 2,
-                    firstDayOfWeek = DayOfWeek.MONDAY
                 ),
                 onCurrentDayClick = { date, events ->
                 },
-                errorMessage = {}
+                errorMessage = {},
+                kalendarType = KalendarType.Oceanic()
             )
         }
     }

diff --git a/buildSrc/src/main/kotlin/ModuleExtension.kt b/buildSrc/src/main/kotlin/ModuleExtension.kt
@@ -1,10 +1,10 @@
 object ModuleExtension {
-    const val compileSdkVersion = 31
-    const val jvmTarget = "1.8"
+    const val compileSdkVersion = 32
+    const val jvmTarget = "11"
 
     object DefaultConfigs {
         const val minSdkVersion = 21
-        const val targetSdkVersion = 31
+        const val targetSdkVersion = 32
         const val testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         const val defaultConsumerProguardFiles = "consumer-rules.pro"
         const val proGuardRules = "proguard-rules.pro"

diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -1,8 +1,8 @@
 object Versions {
-    const val compose = "1.0.5"
-    const val androidGradlePlugin = "7.0.3"
+    const val compose = "1.2.0"
+    const val androidGradlePlugin = "7.2.0"
     const val vanniktechGradlePlugin = "0.18.0"
-    const val kotlin = "1.5.31"
+    const val kotlin = "1.7.0"
     const val activity = "1.3.1"
     const val material = "1.4.0"
     const val jUnit = "4.13.2"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jan 17 14:08:34 CET 2022
+#Fri Jul 29 13:34:16 IST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/kalendar/gradle.properties b/kalendar/gradle.properties
@@ -5,7 +5,7 @@ POM_DESCRIPTION=An Elementary Compose Calendar.
 POM_PACKAGING=aar
 POM_INCEPTION_YEAR=2022
 GROUP=com.himanshoe
-VERSION_NAME=1.0.0-RC5
+VERSION_NAME=1.0.0
 VERSION_CODE=1
 POM_URL=https://github.com/hi-manshu
 POM_LICENCE_NAME=The Apache Software License, Version 2.0