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

Dependency Upgrades | Compose 1.4.3 / Compose-Jb 1.4.0 / Kotlin 1.8.21 #876

Merged
merged 3 commits into from May 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 8 additions & 1 deletion aboutlibraries-compose/build.gradle.kts
Expand Up @@ -10,10 +10,10 @@ plugins {

android {
compileSdk = libs.versions.compileSdk.get().toInt()
namespace = "com.mikepenz.aboutlibraries.ui.compose"

defaultConfig {
minSdk = libs.versions.minSdk.get().toInt()
targetSdk = libs.versions.targetSdk.get().toInt()
}

buildTypes {
Expand Down Expand Up @@ -46,6 +46,13 @@ android {
abortOnError = false
}
}


compose {
kotlinCompilerPlugin.set(libs.versions.composeCompilerJb.get())
kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=${libs.versions.kotlinCore.get()}")
}

kotlin {
jvm()

Expand Down
2 changes: 1 addition & 1 deletion aboutlibraries-compose/src/androidMain/AndroidManifest.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="com.mikepenz.aboutlibraries.ui.compose" />
<manifest />
6 changes: 3 additions & 3 deletions aboutlibraries-core/build.gradle.kts
Expand Up @@ -10,10 +10,10 @@ plugins {

android {
compileSdk = libs.versions.compileSdk.get().toInt()
namespace = "com.mikepenz.aboutlibraries.core"

defaultConfig {
minSdk = libs.versions.minSdk.get().toInt()
targetSdk = libs.versions.targetSdk.get().toInt()
}

buildTypes {
Expand Down Expand Up @@ -74,7 +74,7 @@ kotlin {
mingwX64()
linuxX64()
linuxArm64()
// wasm32()
// wasm()

android {
publishAllLibraryVariants()
Expand Down Expand Up @@ -117,7 +117,7 @@ kotlin {
val watchosSimulatorArm64Main by sourceSets.getting { dependsOn(iosMain) }
val watchosX86Main by sourceSets.getting { dependsOn(iosMain) }
val watchosX64Main by sourceSets.getting { dependsOn(iosMain) }
// val wasm32Main by sourceSets.creating { dependsOn(multiplatformMain) }
// val wasmMain by sourceSets.getting { dependsOn(multiplatformMain) }

val jvmTest by getting {
dependencies {
Expand Down
2 changes: 1 addition & 1 deletion aboutlibraries-core/src/androidMain/AndroidManifest.xml
@@ -1 +1 @@
<manifest package="com.mikepenz.aboutlibraries.core" />
<manifest />
3 changes: 2 additions & 1 deletion aboutlibraries/build.gradle
Expand Up @@ -8,10 +8,11 @@ version VERSION_NAME

android {
compileSdk = libs.versions.compileSdk.get().toInteger()
namespace = "com.mikepenz.aboutlibraries"

defaultConfig {
minSdk = libs.versions.minSdk.get().toInteger()
targetSdk = libs.versions.targetSdk.get().toInteger()

versionName VERSION_NAME
versionCode Integer.parseInt(VERSION_CODE)
}
Expand Down
3 changes: 1 addition & 2 deletions aboutlibraries/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.mikepenz.aboutlibraries">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<application>
<activity
Expand Down
1 change: 1 addition & 0 deletions app-desktop/build.gradle.kts
Expand Up @@ -28,6 +28,7 @@ dependencies {

compose {
kotlinCompilerPlugin.set(libs.versions.composeCompilerJb.get())
kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=${libs.versions.kotlinCore.get()}")
}

tasks.withType<JavaCompile> {
Expand Down
1 change: 1 addition & 0 deletions app/build.gradle
Expand Up @@ -10,6 +10,7 @@ if (getSigningFile() != null) {

android {
compileSdk = libs.versions.compileSdk.get().toInteger()
namespace = "com.mikepenz.aboutlibraries.sample"

defaultConfig {
minSdk = libs.versions.minSdk.get().toInteger()
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.mikepenz.aboutlibraries.sample">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<application
android:name=".CustomApplication"
Expand Down
1 change: 0 additions & 1 deletion gradle.properties
Expand Up @@ -26,6 +26,5 @@ kotlin.mpp.androidSourceSetLayoutVersion=2
android.enableJetifier=false

org.gradle.unsafe.configuration-cache=false
android.disableAutomaticComponentCreation=true
org.jetbrains.compose.experimental.macos.enabled=true
org.jetbrains.compose.experimental.uikit.enabled=true
18 changes: 9 additions & 9 deletions gradle/libs.versions.toml
Expand Up @@ -9,17 +9,17 @@ gradleBuild = "7.4.2"
buildTools = "33.0.2"
# kotlin
dokka = "1.8.10"
kotlinCore = { require = "1.8.10" }
kotlinCore = { require = "1.8.21" }
kotlinCoroutines = { require = "1.6.4" }
kotlinxSerialization = "1.5.0"
# compose
compose = "1.4.1"
composeUi = "1.4.1" # foundation / materila
composeCompiler = "1.4.4"
composejb = "1.3.1"
composeCompilerJb = "1.4.2"
compose = "1.4.3"
composeUi = "1.4.3" # foundation / material
composeCompiler = "1.4.7"
composejb = "1.4.0"
composeCompilerJb = "1.4.5"
# androidx
activity = "1.7.0"
activity = "1.7.1"
cardview = "1.0.0"
constraintLayout = "2.1.4"
core = "1.10.0"
Expand All @@ -31,12 +31,12 @@ material = "1.8.0"
# other
accompanist = "0.30.1"
fastAdapter = "5.7.0"
gradleMvnPublish = "0.25.1"
gradleMvnPublish = "0.25.2"
iconics = "5.3.3"
itemAnimators = "1.1.0"
ivy = "2.5.1"
materialDrawer = "9.0.1"
okhttp = "4.10.0"
okhttp = "4.11.0"

[libraries]
# build
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion plugin-build/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists