From e7b855f182fd6f5f24bfeefbfca1c610e462ed8f Mon Sep 17 00:00:00 2001 From: dw-dinesh Date: Fri, 14 Oct 2022 15:10:39 +0530 Subject: [PATCH] Migrated to Kotlin gradle 1.7.0 --- androidApp/build.gradle.kts | 4 ++-- build.gradle.kts | 2 +- buildSrc/src/main/java/AndroidDependencies.kt | 6 +++--- buildSrc/src/main/java/AppDependencies.kt | 2 +- buildSrc/src/main/java/CommonDependencies.kt | 2 ++ .../src/main/java/ComposeDesktopDependencies.kt | 2 +- iosApp/Podfile.lock | 4 ++-- shared/build.gradle.kts | 4 ++-- shared/shared.podspec | 17 +++++++---------- wearOS/build.gradle.kts | 4 ++-- .../java/com/baseio/wearos/TrendingReposUI.kt | 3 +-- 11 files changed, 24 insertions(+), 26 deletions(-) diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts index c41d922..afaab3b 100644 --- a/androidApp/build.gradle.kts +++ b/androidApp/build.gradle.kts @@ -9,11 +9,11 @@ plugins { } android { - compileSdk = 31 + compileSdk = CommonDependencyVersions.compileSdkVersion defaultConfig { applicationId = "com.baseio.kmm.android" minSdk = 21 - targetSdk = 31 + targetSdk = CommonDependencyVersions.targetSdkVersion versionCode = 1 versionName = "1.0" vectorDrawables { diff --git a/build.gradle.kts b/build.gradle.kts index 81b804f..5ce20b0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${AppDependencyVersions.kotlinGradle}") AppDependencies.plugins.forEach { dependency -> classpath(dependency) } diff --git a/buildSrc/src/main/java/AndroidDependencies.kt b/buildSrc/src/main/java/AndroidDependencies.kt index 9483fec..8166756 100644 --- a/buildSrc/src/main/java/AndroidDependencies.kt +++ b/buildSrc/src/main/java/AndroidDependencies.kt @@ -10,11 +10,11 @@ object AndroidDependencyVersions { const val material = "1.4.0" const val appCompat = "1.4.0" const val constraintLayout = "2.1.2" - const val compose = "1.1.0-rc01" - const val composeKotlinCompiler = "1.1.0-rc02" + const val compose = "1.2.0" + const val composeKotlinCompiler = "1.2.0" const val coil = "1.4.0" const val lifecycleRuntime = "2.4.0" - const val composeActivity = "1.4.0" + const val composeActivity = "1.5.0-rc01" const val ACCOMPANIST_VERSION = "0.24.1-alpha" } diff --git a/buildSrc/src/main/java/AppDependencies.kt b/buildSrc/src/main/java/AppDependencies.kt index 2fb9235..9d1138d 100644 --- a/buildSrc/src/main/java/AppDependencies.kt +++ b/buildSrc/src/main/java/AppDependencies.kt @@ -1,5 +1,5 @@ object AppDependencyVersions { - const val kotlinGradle = "1.6.10" + const val kotlinGradle = "1.7.0" const val androidGradle = "7.1.1" const val kotlinxSerialization = "1.6.10" const val sqlDelight = "1.5.3" diff --git a/buildSrc/src/main/java/CommonDependencies.kt b/buildSrc/src/main/java/CommonDependencies.kt index e08bb0e..90d498e 100644 --- a/buildSrc/src/main/java/CommonDependencies.kt +++ b/buildSrc/src/main/java/CommonDependencies.kt @@ -7,6 +7,8 @@ object CommonDependencyVersions { const val coroutines = "1.6.0" const val koin = "3.1.4" const val junit = "4.13.2" + const val compileSdkVersion = 32 + const val targetSdkVersion = 32 } object CommonMainDependencies { diff --git a/buildSrc/src/main/java/ComposeDesktopDependencies.kt b/buildSrc/src/main/java/ComposeDesktopDependencies.kt index 11db3e5..8165bb6 100644 --- a/buildSrc/src/main/java/ComposeDesktopDependencies.kt +++ b/buildSrc/src/main/java/ComposeDesktopDependencies.kt @@ -1,5 +1,5 @@ object ComposeDesktopDependencyVersions { - const val composeDesktopWeb = "1.0.1-rc2" + const val composeDesktopWeb = "1.2.0-alpha01-dev709" } diff --git a/iosApp/Podfile.lock b/iosApp/Podfile.lock index 7e6547e..0e4fafb 100644 --- a/iosApp/Podfile.lock +++ b/iosApp/Podfile.lock @@ -30,8 +30,8 @@ SPEC CHECKSUMS: KMPNativeCoroutinesCore: a9abca92a371f0c1af62bfb06c94c943ad515114 SDWebImage: 4dc3e42d9ec0c1028b960a33ac6b637bb432207b SDWebImageSwiftUI: 8a3923c95108312b03a599ec1498754af55a6819 - shared: 7b4d6aa8aa7ada5f9dae3229e2524d316cb9f063 + shared: 07cac7993e4f05eda6b76f3a213b070947c3b79f PODFILE CHECKSUM: 3b06299be4209d7c4ba59dbfe9a4c75924eba947 -COCOAPODS: 1.11.2 +COCOAPODS: 1.11.3 diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index f5ff668..dc6029e 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -139,10 +139,10 @@ sqldelight { } android { - compileSdk = 31 + compileSdk = CommonDependencyVersions.compileSdkVersion sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") defaultConfig { minSdk = 21 - targetSdk = 31 + targetSdk = CommonDependencyVersions.targetSdkVersion } } diff --git a/shared/shared.podspec b/shared/shared.podspec index 84e76f1..8b89b9a 100644 --- a/shared/shared.podspec +++ b/shared/shared.podspec @@ -2,24 +2,20 @@ Pod::Spec.new do |spec| spec.name = 'shared' spec.version = '1.0' spec.homepage = 'Link to the Shared Module homepage' - spec.source = { :git => "Not Published", :tag => "Cocoapods/#{spec.name}/#{spec.version}" } + spec.source = { :http=> ''} spec.authors = '' spec.license = '' spec.summary = 'Some description for the Shared Module' - - spec.vendored_frameworks = "build/cocoapods/framework/shared.framework" - spec.libraries = "c++" - spec.module_name = "#{spec.name}_umbrella" - + spec.vendored_frameworks = 'build/cocoapods/framework/shared.framework' + spec.libraries = 'c++' spec.ios.deployment_target = '14.1' - - + spec.pod_target_xcconfig = { 'KOTLIN_PROJECT_PATH' => ':shared', 'PRODUCT_MODULE_NAME' => 'shared', } - + spec.script_phases = [ { :name => 'Build shared', @@ -35,8 +31,9 @@ Pod::Spec.new do |spec| "$REPO_ROOT/../gradlew" -p "$REPO_ROOT" $KOTLIN_PROJECT_PATH:syncFramework \ -Pkotlin.native.cocoapods.platform=$PLATFORM_NAME \ -Pkotlin.native.cocoapods.archs="$ARCHS" \ - -Pkotlin.native.cocoapods.configuration=$CONFIGURATION + -Pkotlin.native.cocoapods.configuration="$CONFIGURATION" SCRIPT } ] + end \ No newline at end of file diff --git a/wearOS/build.gradle.kts b/wearOS/build.gradle.kts index 9cfe222..b3bcbc4 100644 --- a/wearOS/build.gradle.kts +++ b/wearOS/build.gradle.kts @@ -8,11 +8,11 @@ plugins { } android { - compileSdk = 31 + compileSdk = CommonDependencyVersions.compileSdkVersion defaultConfig { applicationId = "com.baseio.wearos" minSdk = 30 - targetSdk = 31 + targetSdk = CommonDependencyVersions.targetSdkVersion versionCode = 1 versionName = "1.0" vectorDrawables { diff --git a/wearOS/src/main/java/com/baseio/wearos/TrendingReposUI.kt b/wearOS/src/main/java/com/baseio/wearos/TrendingReposUI.kt index aeba527..6572708 100644 --- a/wearOS/src/main/java/com/baseio/wearos/TrendingReposUI.kt +++ b/wearOS/src/main/java/com/baseio/wearos/TrendingReposUI.kt @@ -14,11 +14,10 @@ class TrendingReposUI : ComponentActivity() { val viewModel = TrendingReposVM(application) setContent { BaseiOKMMTheme { - val materialBlue700 = Color(0xFF1976D2) // A surface container using the 'background' color from the theme Surface(color = MaterialTheme.colors.background) { Scaffold( - content = { + content = { _ -> TrendingReposListScreen(viewModel) }, )