diff --git a/build.gradle b/build.gradle index ce47372..dca5cac 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,14 @@ buildscript { ext.compose_version = "1.6.6" ext.library_version = "0.5.0" - ext.kotlin_version = "1.9.23" + ext.kotlin_version = "2.1.21" repositories { google() mavenCentral() mavenLocal() } dependencies { - classpath 'com.android.tools.build:gradle:8.13.0' + classpath 'com.android.tools.build:gradle:8.10.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/markdowntext/build.gradle b/markdowntext/build.gradle index e500617..6dcf91f 100644 --- a/markdowntext/build.gradle +++ b/markdowntext/build.gradle @@ -2,7 +2,7 @@ plugins { id 'com.android.library' id 'kotlin-android' id 'maven-publish' - id("org.jetbrains.kotlin.plugin.compose") version "$pKotlinVersion" + alias(libs.plugins.kotlin.compose) } android { @@ -29,8 +29,8 @@ android { } compileOptions { coreLibraryDesugaringEnabled = true - sourceCompatibility pJvmVersion - targetCompatibility pJvmVersion + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } composeOptions { kotlinCompilerExtensionVersion '1.5.12' @@ -44,8 +44,8 @@ android { } dependencies { - implementation 'androidx.core:core-ktx:1.13.1' - implementation "androidx.appcompat:appcompat:$appCompatVersion" + implementation libs.androidx.core.ktx + implementation libs.androidx.appcompat final def markwon_version = '4.6.2' @@ -59,31 +59,31 @@ dependencies { // TODO: Change it after migrating markwon project implementation "com.github.jeziellago:Markwon:58aa5aba6a" - api("io.coil-kt.coil3:coil:$coilVersion") - api("io.coil-kt.coil3:coil-network-okhttp:$coilVersion") + api libs.coil + api libs.coil.network.okhttp api("io.coil-kt.coil3:coil-gif:3.3.0") // Jetpack Compose - implementation "androidx.compose.ui:ui:$compose_version" - implementation "androidx.compose.material3:material3:1.2.1" + implementation libs.androidx.compose.ui + implementation libs.androidx.compose.material3 // Testing dependencies - testImplementation 'junit:junit:4.13.2' + testImplementation libs.junit testImplementation 'org.mockito:mockito-core:5.1.1' testImplementation 'org.mockito.kotlin:mockito-kotlin:4.1.0' - testImplementation 'org.robolectric:robolectric:4.10.3' + testImplementation libs.robolectric testImplementation 'androidx.test:core:1.5.0' testImplementation 'androidx.test.ext:junit:1.1.5' - testImplementation 'io.mockk:mockk:1.13.5' - testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.1' - + testImplementation libs.mockk + testImplementation libs.kotlinx.coroutines.test + // Android Instrumentation Tests androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' - androidTestImplementation 'androidx.test:runner:1.5.2' + androidTestImplementation libs.androidx.test.runner androidTestImplementation 'androidx.test:rules:1.5.0' - androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version" - androidTestImplementation "androidx.compose.ui:ui-test-manifest:$compose_version" + androidTestImplementation libs.androidx.compose.ui + androidTestImplementation libs.androidx.compose.ui androidTestImplementation 'io.mockk:mockk-android:1.13.5' } diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 401893a..0000000 --- a/settings.gradle +++ /dev/null @@ -1,11 +0,0 @@ -dependencyResolutionManagement { - repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) - repositories { - google() - mavenCentral() - maven { url 'https://jitpack.io' } - } -} -rootProject.name = "Compose Markdown" -include ':sample' -include ':markdowntext'