Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrated to Kotlin gradle 1.7.0 #13

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions androidApp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
6 changes: 3 additions & 3 deletions buildSrc/src/main/java/AndroidDependencies.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/java/AppDependencies.kt
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 2 additions & 0 deletions buildSrc/src/main/java/CommonDependencies.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/java/ComposeDesktopDependencies.kt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
object ComposeDesktopDependencyVersions {
const val composeDesktopWeb = "1.0.1-rc2"
const val composeDesktopWeb = "1.2.0-alpha01-dev709"

}

Expand Down
4 changes: 2 additions & 2 deletions iosApp/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions shared/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
17 changes: 7 additions & 10 deletions shared/shared.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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
4 changes: 2 additions & 2 deletions wearOS/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 1 addition & 2 deletions wearOS/src/main/java/com/baseio/wearos/TrendingReposUI.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
},
)
Expand Down