Skip to content

Commit

Permalink
Merge pull request #757 from arkivanov/kotlin-1.9.10
Browse files Browse the repository at this point in the history
Updated Kotlin to 1.9.10, Gradle to 8.0.1, AGP to 8.0.1, coroutines to 1.7.3
  • Loading branch information
CherryPerry authored Sep 5, 2023
2 parents c7c729b + 749e631 commit 484c993
Show file tree
Hide file tree
Showing 22 changed files with 336 additions and 585 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '11'
java-version: '17'
- name: Install dependencies
if: matrix.os == 'ubuntu-latest'
run: sudo apt-get update && sudo apt-get install libcurl4-openssl-dev libgtk-3-dev nodejs chromium-browser
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '11'
java-version: '17'
- name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@v1
- name: Release JVM, Android, JS, Linux
Expand Down Expand Up @@ -73,7 +73,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '11'
java-version: '17'
- name: Select Xcode version
uses: maxim-lobanov/setup-xcode@9a697e2b393340c3cacd97468baa318e4c883d98
with:
Expand Down Expand Up @@ -101,7 +101,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '11'
java-version: '17'
- name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@v1
- name: Check JVM, Android, JS, Linux
Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '11'
java-version: '17'
- name: Select Xcode version
uses: maxim-lobanov/setup-xcode@9a697e2b393340c3cacd97468baa318e4c883d98
with:
Expand Down
7 changes: 0 additions & 7 deletions coroutines-interop/api/android/coroutines-interop.api
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
public final class com/badoo/reaktive/coroutinesinterop/BuildConfig {
public static final field BUILD_TYPE Ljava/lang/String;
public static final field DEBUG Z
public static final field LIBRARY_PACKAGE_NAME Ljava/lang/String;
public fun <init> ()V
}

public final class com/badoo/reaktive/coroutinesinterop/CompletableFromCoroutineKt {
public static final fun asCompletable (Lkotlin/jvm/functions/Function1;)Lcom/badoo/reaktive/completable/Completable;
public static final fun asCompletable (Lkotlin/jvm/functions/Function2;)Lcom/badoo/reaktive/completable/Completable;
Expand Down
4 changes: 3 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,7 @@ android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true

kotlin.mpp.enableCompatibilityMetadataVariant=true
kotlin.mpp.androidSourceSetLayoutVersion=2

# For compatibility with Kotlin 1.9.0, see https://github.com/badoo/Reaktive/issues/697
android.experimental.lint.version=8.1.0
8 changes: 4 additions & 4 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
kotlin = "1.8.21"
kotlinx-coroutines = "1.7.1"
kotlin = "1.9.10"
kotlinx-coroutines = "1.7.3"
detekt = "1.22.0"

[libraries]
Expand All @@ -14,11 +14,11 @@ kotlin-test-js = { module = "org.jetbrains.kotlin:kotlin-test-js", version.ref =
kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
kotlin-test-annotations = { module = "org.jetbrains.kotlin:kotlin-test-annotations-common", version.ref = "kotlin" }

kotlinx-compatibility = "org.jetbrains.kotlinx:binary-compatibility-validator:0.13.0"
kotlinx-compatibility = "org.jetbrains.kotlinx:binary-compatibility-validator:0.13.2"
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }

android-plugin = "com.android.tools.build:gradle:7.3.1"
android-plugin = "com.android.tools.build:gradle:8.0.2"

androidx-appcompat = "androidx.appcompat:appcompat:1.4.2"
androidx-constraintLayout = "androidx.constraintlayout:constraintlayout:1.1.3"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,15 @@ package com.badoo.reaktive.configuration
import com.android.build.gradle.BaseExtension
import com.badoo.reaktive.getLibrary
import org.gradle.api.Action
import org.gradle.api.JavaVersion
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.invoke
import org.gradle.kotlin.dsl.withType
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

class MppConfigurationPlugin : Plugin<Project> {

Expand Down Expand Up @@ -137,9 +140,18 @@ class MppConfigurationPlugin : Plugin<Project> {
minSdk = 1
targetSdk = 29
}
compileOptions {
sourceCompatibility(JavaVersion.VERSION_1_8)
targetCompatibility(JavaVersion.VERSION_1_8)
}
}
project.tasks.withType<KotlinCompile> {
kotlinOptions {
jvmTarget = "1.8"
}
}
project.kotlin {
android {
androidTarget {
publishLibraryVariants("release", "debug")
disableIfUndefined(Target.JVM)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import org.gradle.api.publish.maven.tasks.PublishToMavenRepository
import org.gradle.api.publish.plugins.PublishingPlugin
import org.gradle.jvm.tasks.Jar
import org.gradle.kotlin.dsl.withType
import org.gradle.plugins.signing.Sign
import org.gradle.plugins.signing.SigningExtension
import org.gradle.plugins.signing.SigningPlugin
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinMultiplatformPlugin
Expand Down Expand Up @@ -98,6 +99,12 @@ class PublishConfigurationPlugin : Plugin<Project> {
useInMemoryPgpKeys(inMemoryKey, password)
}
}

// Workaround for https://github.com/gradle/gradle/issues/26091
val signingTasks = project.tasks.withType<Sign>()
project.tasks.withType<AbstractPublishToMaven>().configureEach {
dependsOn(signingTasks)
}
}

private fun createFilteredPublishTasks(project: Project) {
Expand Down
Loading

0 comments on commit 484c993

Please sign in to comment.