Merge pull request #44 from SimformSolutionsPvtLtd/develop

Develop

Author: yashwantGowla

app/build.gradle

@@ -4,13 +4,12 @@ plugins {
 }
 
 android {
-    compileSdk 31
-    buildToolsVersion "30.0.3"
+    compileSdk 33
 
     defaultConfig {
         applicationId "com.simform.ssjetpackcomposeprogressbutton"
         minSdk 21
-        targetSdk 30
+        targetSdk 33
         versionCode 2
         versionName "1.0.7"
 
@@ -32,23 +31,21 @@ android {
     }
     kotlinOptions {
         jvmTarget = '11'
-        useIR = true
     }
     buildFeatures {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion compose_version
-        kotlinCompilerVersion kotlin_version
+        kotlinCompilerExtensionVersion compose_compiler
     }
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'com.google.android.material:material:1.5.0'
-    implementation "androidx.compose.ui:ui:1.0.5"
+    implementation 'androidx.appcompat:appcompat:1.6.0-rc01'
+    implementation 'com.google.android.material:material:1.6.1'
+    implementation "androidx.compose.ui:ui:1.2.1"
     implementation "androidx.compose.material:material:$compose_version"
     implementation "androidx.compose.ui:ui-tooling:$compose_version"
-    implementation 'androidx.activity:activity-compose:1.4.0'
+    implementation 'androidx.activity:activity-compose:1.5.1'
     implementation project(path: ':ssjetpackcomposeprogressbutton')
 }

build.gradle

@@ -1,16 +1,20 @@
 buildscript {
     ext {
-        compose_version = '1.0.0-rc02'
-        kotlin_version = '1.5.10'
+        compose_version = '1.2.1'
+        compose_compiler = '1.3.1'
     }
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.10'
-        classpath 'com.android.tools.lint:lint:30.0.4'
+        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10'
+    }
+    configurations {
+        all {
+            exclude group: 'androidx.lifecycle', module: 'lifecycle-viewmodel-ktx'
+        }
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Thu May 06 09:44:53 IST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

ssjetpackcomposeprogressbutton/build.gradle

@@ -12,21 +12,18 @@ afterEvaluate {
                 from components.release
                 groupId = 'com.simform.ssloadingbuttonlibrary'
                 artifactId = 'ssjetpackcomposeprogressbutton'
-                version = '1.0.7'
+                version = '1.0.8'
             }
         }
     }
 }
 
 android {
-    compileSdk 30
-    buildToolsVersion "30.0.3"
+    compileSdk 33
 
     defaultConfig {
         minSdk 21
-        targetSdk 30
-        versionCode 1
-        versionName "1.0"
+        targetSdk 33
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -45,7 +42,6 @@ android {
     }
 
     kotlinOptions {
-        useIR = true
         jvmTarget = '11'
     }
 
@@ -55,8 +51,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion compose_version
-        kotlinCompilerVersion kotlin_version
+        kotlinCompilerExtensionVersion compose_compiler
     }
 }