Merge pull request #41 from Vacxe/update-espresso

Update espresso
KakaoCup · Nov 17, 2022 · d35eac8 · d35eac8
2 parents 324a7c3 + bfda084
commit d35eac8
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 16 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:7.3.0"
+        classpath "com.android.tools.build:gradle:7.3.1"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -3,15 +3,14 @@ plugins {
 }
 
 repositories {
-    jcenter()
     google()
     mavenCentral()
     gradlePluginPortal()
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21")
-    implementation("com.android.tools.build:gradle:4.2.2")
-    implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.4.32")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20")
+    implementation("com.android.tools.build:gradle:7.3.1")
+    implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.7.20")
     implementation("org.kohsuke:github-api:1.129")
 }
diff --git a/buildsystem/version b/buildsystem/version
@@ -1 +1 @@
-0.1.1
+0.2.0
diff --git a/compose/build.gradle.kts b/compose/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 android {
-    compileSdkVersion(33)
+    compileSdk = 33
     defaultConfig.apply {
         minSdk = 21
         targetSdk = 33

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,13 +2,15 @@
 kotlinVersion = "1.7.20"
 dokkaVersion = "1.7.10"
 appcompatVersion = "1.5.1"
-espressoVersion = "3.4.0"
+espressoVersion = "3.5.0"
+
 junitVersion = "4.13.2"
 junitExtVersion = "1.1.3"
 multidexVersion = "2.0.1"
 materialVersion = "1.4.0"
 activityComposeVersion = "1.6.0"
-composeVersion = "1.2.1"
+composeVersion = "1.3.1"
+composeCompilerVersion = "1.3.2"
 
 [libraries]
 composeActivityCompose = { module = "androidx.activity:activity-compose", version.ref = "activityComposeVersion" }

diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
@@ -19,19 +19,13 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerVersion = libs.versions.kotlinVersion.get()
-        kotlinCompilerExtensionVersion = "1.3.2"
+        kotlinCompilerExtensionVersion = libs.versions.composeCompilerVersion.get()
     }
 
     packagingOptions {
         resources.excludes.add("META-INF/*")
     }
 
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-
     kotlinOptions {
         jvmTarget = "11"
     }