Merge pull request onebone#50 from wiryadev/independent-versioning-co…

…mpose-compiler independent versioning compose compiler
dpastor · Jun 30, 2022 · 14d1664 · 14d1664
2 parents f76bd79 + cdd748e
commit 14d1664
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -32,18 +32,16 @@ android {
     }
     kotlinOptions {
         jvmTarget = '1.8'
-        useIR = true
     }
     buildFeatures {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion compose_version
+        kotlinCompilerExtensionVersion compose_compiler_version
     }
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.core:core-ktx:1.7.0'
     implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'com.google.android.material:material:1.5.0'
@@ -52,7 +50,7 @@ dependencies {
     implementation "androidx.compose.ui:ui-tooling:$compose_version"
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1'
     implementation 'androidx.activity:activity-compose:1.4.0'
-    testImplementation 'junit:junit:4.+'
+    testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"

diff --git a/build.gradle b/build.gradle
@@ -3,16 +3,17 @@ buildscript {
     ext {
         library_version = '2.3.3'
 
-        kotlin_version = '1.6.10'
+        kotlin_version = '1.7.0'
         compose_version = '1.1.1'
+        compose_compiler_version = '1.2.0'
     }
 
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
+        classpath 'com.android.tools.build:gradle:7.1.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/lib/build.gradle b/lib/build.gradle
@@ -27,7 +27,6 @@ android {
     }
     kotlinOptions {
         jvmTarget = '1.8'
-        useIR = true
 
         freeCompilerArgs = ['-Xopt-in=kotlin.RequiresOptIn']
     }
@@ -37,7 +36,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion "$compose_version"
+        kotlinCompilerExtensionVersion "$compose_compiler_version"
     }
 
     packagingOptions {
@@ -47,8 +46,7 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    testImplementation 'junit:junit:4.+'
+    testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'