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.

Sign up for GitHub

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

config: migrate to kotlin 2.0 #28

Merged
merged 3 commits into from
Sep 22, 2024
Merged

config: migrate to kotlin 2.0 #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d68be4
config: upgrade kotlin version
Sep 22, 2024
914e78f
fix: update other dependencies
Sep 22, 2024
473e34d
update: upgrade version to 0.1.0-alpha13
Sep 22, 2024
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
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ captures
.externalNativeBuild
.cxx
local.properties
xcuserdata
xcuserdata
.kotlin
8 changes: 6 additions & 2 deletions convention/publishing/src/main/kotlin/com/attafitamim/kabin/publish/PublishConventions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.attafitamim.kabin.publish

import com.vanniktech.maven.publish.MavenPublishBaseExtension
import com.vanniktech.maven.publish.SonatypeHost
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.publish.maven.MavenPom
Expand All @@ -10,7 +11,7 @@ import org.gradle.api.publish.maven.MavenPomScm

class PublishConventions : Plugin<Project> {

private val version = "0.1.0-alpha12"
private val version = "0.1.0-alpha13"
private val group = "com.attafitamim.kabin"

override fun apply(project: Project) {
Expand All @@ -23,7 +24,10 @@ class PublishConventions : Plugin<Project> {
mavenPublishing.apply {
coordinates(group, artifact, version)
pom(MavenPom::configure)
publishToMavenCentral(com.vanniktech.maven.publish.SonatypeHost.CENTRAL_PORTAL)
publishToMavenCentral(
SonatypeHost.CENTRAL_PORTAL,
automaticRelease = true
)
signAllPublications()
}
}
Expand Down
16 changes: 8 additions & 8 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
android-gradle-plugin = "8.3.2"
core-ktx = "1.13.1"
junit = "4.13.2"
androidx-test-ext-junit = "1.1.5"
espresso-core = "3.5.1"
appcompat = "1.6.1"
material = "1.11.0"
androidx-test-ext-junit = "1.2.1"
espresso-core = "3.6.1"
appcompat = "1.7.0"
material = "1.12.0"

# Kotlin
kotlin = "1.9.24"
kotlin-poet = "1.16.0"
kotlin-coroutines = "1.8.0"
kotlin-ksp = "1.9.24-1.0.20"
kotlin = "2.0.20"
kotlin-poet = "1.18.1"
kotlin-coroutines = "1.9.0"
kotlin-ksp = "2.0.20-1.0.25"

# Docs
dokka = "1.9.20"
Expand Down
6 changes: 5 additions & 1 deletion sample/shared/shared.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Pod::Spec.new do |spec|
spec.summary = 'Some description for the Shared Module'
spec.vendored_frameworks = 'build/cocoapods/framework/shared.framework'
spec.libraries = 'c++'
spec.ios.deployment_target = '16.0'
spec.ios.deployment_target = '16.0'


if !Dir.exist?('build/cocoapods/framework/shared.framework') || Dir.empty?('build/cocoapods/framework/shared.framework')
Expand All @@ -22,6 +22,10 @@ Pod::Spec.new do |spec|
Alternatively, proper pod installation is performed during Gradle sync in the IDE (if Podfile location is set)"
end

spec.xcconfig = {
'ENABLE_USER_SCRIPT_SANDBOXING' => 'NO',
}

spec.pod_target_xcconfig = {
'KOTLIN_PROJECT_PATH' => ':sample:shared',
'PRODUCT_MODULE_NAME' => 'shared',
Expand Down
Loading