Skip to content

Commit

Permalink
WIP: upgrade gradle and kotlin
Browse files Browse the repository at this point in the history
  • Loading branch information
IlyaGulya committed Jan 10, 2024
1 parent 0810753 commit e87de8c
Show file tree
Hide file tree
Showing 7 changed files with 72 additions and 72 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ android.enableJetifier=true
kotlin.mpp.applyDefaultHierarchyTemplate=false

# For compatibility with Kotlin 1.9.0, see https://github.com/badoo/Reaktive/issues/697
android.experimental.lint.version=8.1.0
#android.experimental.lint.version=8.2.1
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[versions]
kotlin = "1.9.21"
kotlin = "1.9.22"
kotlinx-coroutines = "1.8.0-RC2"
detekt = "1.22.0"

Expand All @@ -14,7 +14,7 @@ kotlinx-compatibility = "org.jetbrains.kotlinx:binary-compatibility-validator:0.
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:8.0.2"
android-plugin = "com.android.tools.build:gradle:8.2.1"

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-8.0.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
34 changes: 0 additions & 34 deletions rxjava2-interop/build.gradle

This file was deleted.

34 changes: 34 additions & 0 deletions rxjava2-interop/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
id("org.jetbrains.kotlin.jvm")
id("publish-configuration")
id("detekt-configuration")
}

group = findProperty("reaktive_group_id") as String
version = findProperty("reaktive_version") as String

kotlin {
compilerOptions {
jvmTarget = JvmTarget.JVM_1_8
}
}

java {
targetCompatibility = JavaVersion.VERSION_1_8
}

publishing {
publications {
create<MavenPublication>("jvm") {
from(components["java"])
artifact(tasks["kotlinSourcesJar"])
}
}
}

dependencies {
implementation(project(":reaktive"))
implementation(libs.rxjava2)
}
34 changes: 0 additions & 34 deletions rxjava3-interop/build.gradle

This file was deleted.

34 changes: 34 additions & 0 deletions rxjava3-interop/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
id("org.jetbrains.kotlin.jvm")
id("publish-configuration")
id("detekt-configuration")
}

group = findProperty("reaktive_group_id") as String
version = findProperty("reaktive_version") as String

kotlin {
compilerOptions {
jvmTarget = JvmTarget.JVM_1_8
}
}

java {
targetCompatibility = JavaVersion.VERSION_1_8
}

publishing {
publications {
create<MavenPublication>("jvm") {
from(components["java"])
artifact(tasks["kotlinSourcesJar"])
}
}
}

dependencies {
implementation(project(":reaktive"))
implementation(libs.rxjava3)
}

0 comments on commit e87de8c

Please sign in to comment.