From a2d3433dd0c1ec48739670501bc5e335364bc0a3 Mon Sep 17 00:00:00 2001 From: Waqas Tahir Date: Fri, 6 May 2022 16:16:48 +0100 Subject: [PATCH] changes --- .idea/modules.xml | 18 +++++++++--------- README.md | 2 +- android/build.gradle.kts | 17 +++++++---------- build.gradle.kts | 11 +++++------ buildSrc/build.gradle.kts | 9 --------- buildSrc/src/main/java/BuildConfig.kt | 25 ------------------------- desktop/build.gradle.kts | 5 +---- gradle.properties | 19 ++++--------------- linkpreview/build.gradle.kts | 10 +++++----- settings.gradle.kts | 7 +++++++ 10 files changed, 39 insertions(+), 84 deletions(-) delete mode 100644 buildSrc/build.gradle.kts delete mode 100644 buildSrc/src/main/java/BuildConfig.kt diff --git a/.idea/modules.xml b/.idea/modules.xml index 226369a..fe5f24c 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -4,20 +4,20 @@ + + + - - - - - - - - - + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index 0fec588..e98165d 100644 --- a/README.md +++ b/README.md @@ -14,5 +14,5 @@ the metadata information about the site , Use it however you like ```kotlin // getLinkPreview throws an exception when encounters an error -val preview = runCatching { getLinkPreview(url) }.getOrNull() +val preview = try { getLinkPreview(url) }catch(ex : Exception){ null } ``` diff --git a/android/build.gradle.kts b/android/build.gradle.kts index 7009914..9988f41 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -1,12 +1,9 @@ plugins { - id("org.jetbrains.compose") version BuildConfig.Info.ComposeVersion + id("org.jetbrains.compose") id("com.android.application") kotlin("android") } -group = BuildConfig.Info.group -version = BuildConfig.Info.version - dependencies { implementation("androidx.activity:activity-compose:1.4.0") implementation(project(":linkpreview")) @@ -15,17 +12,17 @@ dependencies { implementation(material) implementation(foundation) } - implementation("io.coil-kt:coil-compose:2.0.0-rc02") + implementation("io.coil-kt:coil-compose:2.0.0-rc03") } android { - compileSdk = BuildConfig.Android.compileSdkVersion + compileSdk = 31 defaultConfig { applicationId = "com.wakaztahir.android" - minSdk = BuildConfig.Android.minSdkVersion - targetSdk = BuildConfig.Android.targetSdkVersion - versionCode = BuildConfig.Info.versionCode - versionName = BuildConfig.Info.version + minSdk = 21 + targetSdk = 31 + versionCode = 1 + versionName = "1.0" } compileOptions { sourceCompatibility = JavaVersion.VERSION_1_8 diff --git a/build.gradle.kts b/build.gradle.kts index f61f5d9..161d43e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,18 +5,17 @@ buildscript { mavenCentral() } dependencies { - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${BuildConfig.Info.KotlinVersion}") - classpath("com.android.tools.build:gradle:7.0.4") classpath("com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4") classpath("com.github.dcendents:android-maven-gradle-plugin:1.4.1") } } -group = BuildConfig.Info.group -version = BuildConfig.Info.version - plugins { - id("org.jetbrains.dokka") version BuildConfig.Info.DokkaVersion + kotlin("multiplatform").apply(false) + id("org.jetbrains.compose").apply(false) + id("com.android.application").apply(false) + id("com.android.library").apply(false) + id("org.jetbrains.dokka") } tasks.withType(){ diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts deleted file mode 100644 index 8e88a95..0000000 --- a/buildSrc/build.gradle.kts +++ /dev/null @@ -1,9 +0,0 @@ -import org.gradle.kotlin.dsl.`kotlin-dsl` - -plugins { - `kotlin-dsl` -} - -repositories { - mavenCentral() -} \ No newline at end of file diff --git a/buildSrc/src/main/java/BuildConfig.kt b/buildSrc/src/main/java/BuildConfig.kt deleted file mode 100644 index 219c797..0000000 --- a/buildSrc/src/main/java/BuildConfig.kt +++ /dev/null @@ -1,25 +0,0 @@ -object BuildConfig { - object Info { - const val group = "com.wakaztahir" - const val version = "1.0.2" - const val versionCode = 1 - - const val ComposeVersion = "1.1.1" - const val KotlinVersion = "1.6.10" - const val DokkaVersion = "1.6.10" - } - - object Android { - const val minSdkVersion = 21 - const val compileSdkVersion = 31 - const val targetSdkVersion = 31 - } - - object Dependencies { - object Compose { - val runtime get() = "org.jetbrains.compose.runtime:runtime:${Info.ComposeVersion}" - val foundation get() = "org.jetbrains.compose.foundation:foundation:${Info.ComposeVersion}" - val material get() = "org.jetbrains.compose.material:material:${Info.ComposeVersion}" - } - } -} \ No newline at end of file diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts index 7971918..a0f6553 100644 --- a/desktop/build.gradle.kts +++ b/desktop/build.gradle.kts @@ -3,12 +3,9 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat plugins { kotlin("multiplatform") - id("org.jetbrains.compose") version BuildConfig.Info.ComposeVersion + id("org.jetbrains.compose") } -group = BuildConfig.Info.group -version = BuildConfig.Info.version - kotlin { jvm { compilations.all { diff --git a/gradle.properties b/gradle.properties index 9e6fce1..f01e338 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,19 +1,8 @@ -# Project-wide Gradle settings. - -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. - -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html - -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. android.enableJetifier=true android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. More details, visit -# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true +version=1.0.3 +kotlin.version=1.6.21 +compose.version=1.2.0-alpha01-dev679 +agp.version=7.0.4 \ No newline at end of file diff --git a/linkpreview/build.gradle.kts b/linkpreview/build.gradle.kts index 765b83b..6fc4312 100644 --- a/linkpreview/build.gradle.kts +++ b/linkpreview/build.gradle.kts @@ -8,15 +8,15 @@ plugins { id("org.jetbrains.dokka") } -group = BuildConfig.Info.group -version = BuildConfig.Info.version +group = "com.wakaztahir" +version = property("version") as String android { - compileSdk = BuildConfig.Android.compileSdkVersion + compileSdk = 31 sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") defaultConfig { - minSdk = BuildConfig.Android.minSdkVersion - targetSdk = BuildConfig.Android.targetSdkVersion + minSdk = 21 + targetSdk = 31 consumerProguardFiles("proguard-rules.pro") } compileOptions { diff --git a/settings.gradle.kts b/settings.gradle.kts index 6e54426..67db233 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -5,6 +5,13 @@ pluginManagement { mavenCentral() maven { url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") } } + plugins { + kotlin("multiplatform").version(extra["kotlin.version"] as String) + id("org.jetbrains.compose").version(extra["compose.version"] as String) + id("com.android.application").version(extra["agp.version"] as String) + id("com.android.library").version(extra["agp.version"] as String) + id("org.jetbrains.dokka").version(extra["kotlin.version"] as String) + } } rootProject.name = "KMPLinkPreview"