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

dev -> main #808

Merged
merged 5 commits into from
Oct 15, 2022
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

## Latest releases 🛠

- (Next Gen) Kotlin && Multiplatform && Plugin | [v10.5.0](https://github.com/mikepenz/AboutLibraries/tree/v10.5.0)
- (Next Gen) Kotlin && Multiplatform && Plugin | [v10.5.1](https://github.com/mikepenz/AboutLibraries/tree/v10.5.1)
- Kotlin && Gradle Plugin | [v8.9.4](https://github.com/mikepenz/AboutLibraries/tree/v8.9.4)

## Gradle Plugin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import android.content.Context
import android.widget.TextView
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.LazyListScope
import androidx.compose.foundation.lazy.LazyListState
Expand All @@ -16,7 +15,6 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.toArgb
Expand All @@ -25,7 +23,6 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.viewinterop.AndroidView
import androidx.compose.ui.window.DialogProperties
import androidx.core.text.HtmlCompat
import com.mikepenz.aboutlibraries.Libs
import com.mikepenz.aboutlibraries.entity.Library
Expand Down Expand Up @@ -126,7 +123,6 @@ fun Libraries(
}
}

@OptIn(ExperimentalComposeUiApi::class)
@Composable
fun LicenseDialog(
library: Library,
Expand Down Expand Up @@ -155,8 +151,6 @@ fun LicenseDialog(
)
}
},
modifier = Modifier.padding(16.dp),
properties = DialogProperties(usePlatformDefaultWidth = false),
)
}

Expand Down
5 changes: 4 additions & 1 deletion app-desktop/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import org.jetbrains.compose.compose
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
Expand All @@ -24,6 +23,10 @@ dependencies {
implementation(libs.kotlin.coroutines.core)
}

compose {
kotlinCompilerPlugin.set(libs.versions.composeCompiler.get())
}

tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = "11"
}
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GROUP=com.mikepenz
VERSION_NAME=10.5.0
VERSION_CODE=100500
VERSION_NAME=10.5.1
VERSION_CODE=100501

POM_URL=https://github.com/mikepenz/AboutLibraries
POM_SCM_URL=https://github.com/mikepenz/AboutLibraries
Expand Down
10 changes: 5 additions & 5 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ targetSdk = "33"
gradleBuild = "7.3.0"
buildTools = "33.0.0"
# kotlin
dokka = "1.7.10"
kotlinCore = { require = "1.7.10" }
dokka = "1.7.20"
kotlinCore = { require = "1.7.20" }
kotlinCoroutines = { require = "1.6.4" }
kotlinxSerialization = "1.4.0"
# compose
compose = "1.2.1"
composeCompiler = "1.3.1"
composejb = "1.2.0-beta01"
composeCompiler = "1.3.2"
composejb = "1.2.0"
# androidx
activity = "1.6.0"
cardview = "1.0.0"
Expand All @@ -28,7 +28,7 @@ recyclerView = "1.2.1"
material = "1.6.1"
# other
accompanist = "0.25.1"
fastAdapter = "5.6.0"
fastAdapter = "5.7.0"
gradleMvnPublish = "0.18.0"
iconics = "5.3.3"
itemAnimators = "1.1.0"
Expand Down
2 changes: 1 addition & 1 deletion multiplatform-demo/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
kotlin.code.style=official
kotlin.version=1.7.10
compose.version=1.2.0-beta01
aboutlibraries.version=10.4.0
aboutlibraries.version=10.5.0

# define the export path for aboutLibraries files
aboutLibraries.exportPath=src/jvmMain/resources/