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

Refactor gradle property retrieval with lazy APIs | Upgrade Gradle to 8.11 | Increase gradle min requirement to 7.x #1036

Merged
merged 5 commits into from
Nov 16, 2024
Merged

Refactor gradle property retrieval with lazy APIs | Upgrade Gradle to 8.11 | Increase gradle min requirement to 7.x #1036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
937da33
- replace some eager APIs with lazy provider APIs
mikepenz Nov 16, 2024
8b04048
- update to gradle 8.11
mikepenz Nov 16, 2024
e435a9e
- use `-all` as it's better for dev
mikepenz Nov 16, 2024
cb2bf76
- improve loading generated res for android task
mikepenz Nov 16, 2024
6359dce
- require at least Gradle 7.x
mikepenz Nov 16, 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
2 changes: 1 addition & 1 deletion app-desktop/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@

### Run Desktop app

```
```bash
./gradlew :app-desktop:run
```
54 changes: 27 additions & 27 deletions app-desktop/src/main/resources/aboutlibraries.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"metadata": {
"generated": "2024-11-01T18:58:28.538Z"
"generated": "2024-11-16T14:12:37.75Z"
},
"libraries": [
{
Expand Down Expand Up @@ -160,7 +160,7 @@
"name": "Mike Penz"
}
],
"artifactVersion": "11.2.3",
"artifactVersion": "11.3.0-b01",
"description": "AboutLibraries automatically detects all dependencies of a project and collects their information including the license. Optionally visualising it via the provided ui components.",
"scm": {
"connection": "scm:git@github.com:mikepenz/AboutLibraries.git",
Expand All @@ -183,7 +183,7 @@
"name": "Mike Penz"
}
],
"artifactVersion": "11.2.3",
"artifactVersion": "11.3.0-b01",
"description": "AboutLibraries automatically detects all dependencies of a project and collects their information including the license. Optionally visualising it via the provided ui components.",
"scm": {
"connection": "scm:git@github.com:mikepenz/AboutLibraries.git",
Expand All @@ -207,7 +207,7 @@
"name": "Compose Multiplatform Team"
}
],
"artifactVersion": "2.8.3",
"artifactVersion": "2.8.4",
"description": "Compose integration with Lifecycle",
"scm": {
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
Expand All @@ -231,7 +231,7 @@
"name": "Compose Multiplatform Team"
}
],
"artifactVersion": "1.7.0",
"artifactVersion": "1.7.1",
"description": "Animation engine and animation primitives that are the building blocks of the Compose animation library",
"scm": {
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
Expand All @@ -255,7 +255,7 @@
"name": "Compose Multiplatform Team"
}
],
"artifactVersion": "1.7.0",
"artifactVersion": "1.7.1",
"description": "Compose animation library",
"scm": {
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
Expand All @@ -279,7 +279,7 @@
"name": "Compose Multiplatform Team"
}
],
"artifactVersion": "1.7.0",
"artifactVersion": "1.7.1",
"description": "Compose Desktop",
"scm": {
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
Expand All @@ -303,7 +303,7 @@
"name": "Compose Multiplatform Team"
}
],
"artifactVersion": "1.7.0",
"artifactVersion": "1.7.1",
"description": "Higher level abstractions of the Compose UI primitives. This library is design system agnostic, providing the high-level building blocks for both application and design-system developers",
"scm": {
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
Expand All @@ -327,7 +327,7 @@
"name": "Compose Multiplatform Team"
}
],
"artifactVersion": "1.7.0",
"artifactVersion": "1.7.1",
"description": "Compose layout implementations",
"scm": {
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
Expand All @@ -351,7 +351,7 @@
"name": "Compose Multiplatform Team"
}
],
"artifactVersion": "1.7.0",
"artifactVersion": "1.7.1",
"description": "Compose Material You Design Components library",
"scm": {
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
Expand All @@ -375,7 +375,7 @@
"name": "Compose Multiplatform Team"
}
],
"artifactVersion": "1.7.0",
"artifactVersion": "1.7.1",
"description": "Compose Material Design Components library",
"scm": {
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
Expand All @@ -399,7 +399,7 @@
"name": "Compose Multiplatform Team"
}
],
"artifactVersion": "1.7.0",
"artifactVersion": "1.7.1",
"description": "Compose Material Design core icons. This module contains the most commonly used set of Material icons.",
"scm": {
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
Expand All @@ -423,7 +423,7 @@
"name": "Compose Multiplatform Team"
}
],
"artifactVersion": "1.7.0",
"artifactVersion": "1.7.1",
"description": "Material ripple used to build interactive components",
"scm": {
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
Expand All @@ -447,7 +447,7 @@
"name": "Compose Multiplatform Team"
}
],
"artifactVersion": "1.7.0",
"artifactVersion": "1.7.1",
"description": "Tree composition support for code generated by the Compose compiler plugin and corresponding public API",
"scm": {
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
Expand All @@ -471,7 +471,7 @@
"name": "Compose Multiplatform Team"
}
],
"artifactVersion": "1.7.0",
"artifactVersion": "1.7.1",
"description": "Compose components that allow saving and restoring the local ui state",
"scm": {
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
Expand All @@ -495,7 +495,7 @@
"name": "Compose Multiplatform Team"
}
],
"artifactVersion": "1.7.0",
"artifactVersion": "1.7.1",
"description": "Compose UI primitives. This library contains the primitives that form the Compose UI Toolkit, such as drawing, measurement and layout.",
"scm": {
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
Expand All @@ -519,7 +519,7 @@
"name": "Compose Multiplatform Team"
}
],
"artifactVersion": "1.7.0",
"artifactVersion": "1.7.1",
"description": "Compose classes related to dimensions without units",
"scm": {
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
Expand All @@ -543,7 +543,7 @@
"name": "Compose Multiplatform Team"
}
],
"artifactVersion": "1.7.0",
"artifactVersion": "1.7.1",
"description": "Compose graphics",
"scm": {
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
Expand All @@ -567,7 +567,7 @@
"name": "Compose Multiplatform Team"
}
],
"artifactVersion": "1.7.0",
"artifactVersion": "1.7.1",
"description": "Compose Text primitives and utilities",
"scm": {
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
Expand All @@ -591,7 +591,7 @@
"name": "Compose Multiplatform Team"
}
],
"artifactVersion": "1.7.0",
"artifactVersion": "1.7.1",
"description": "Compose tooling library API. This library provides the API required to declare @Preview composables in user apps.",
"scm": {
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
Expand All @@ -615,7 +615,7 @@
"name": "Compose Multiplatform Team"
}
],
"artifactVersion": "1.7.0",
"artifactVersion": "1.7.1",
"description": "Compose classes for simple units",
"scm": {
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
Expand All @@ -639,7 +639,7 @@
"name": "Compose Multiplatform Team"
}
],
"artifactVersion": "1.7.0",
"artifactVersion": "1.7.1",
"description": "Internal Compose utilities used by other modules",
"scm": {
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
Expand Down Expand Up @@ -845,7 +845,7 @@
"name": "JetBrains Team"
}
],
"artifactVersion": "1.7.1",
"artifactVersion": "1.7.3",
"description": "Kotlin multiplatform serialization runtime library",
"scm": {
"url": "https://github.com/Kotlin/kotlinx.serialization"
Expand All @@ -867,7 +867,7 @@
"name": "JetBrains Team"
}
],
"artifactVersion": "1.7.1",
"artifactVersion": "1.7.3",
"description": "Kotlin multiplatform serialization runtime library",
"scm": {
"url": "https://github.com/Kotlin/kotlinx.serialization"
Expand All @@ -889,7 +889,7 @@
"name": "JetBrains Team"
}
],
"artifactVersion": "1.7.1",
"artifactVersion": "1.7.3",
"description": "Kotlin multiplatform serialization runtime library",
"scm": {
"url": "https://github.com/Kotlin/kotlinx.serialization"
Expand All @@ -911,7 +911,7 @@
"name": "Compose Multiplatform Team"
}
],
"artifactVersion": "0.8.15",
"artifactVersion": "0.8.18",
"description": "Kotlin Skia bindings",
"scm": {
"connection": "scm:git:https://www.github.com/JetBrains/skiko.git",
Expand All @@ -935,7 +935,7 @@
"name": "Compose Multiplatform Team"
}
],
"artifactVersion": "0.8.15",
"artifactVersion": "0.8.18",
"description": "Kotlin Skia bindings",
"scm": {
"connection": "scm:git:https://www.github.com/JetBrains/skiko.git",
Expand Down
2 changes: 1 addition & 1 deletion app-test/files/aboutlibraries.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions app-wasm/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@

### Run Wasm app

```
./gradlew :app-wasm:wasmJsRun
```bash
./gradlew :app-wasm:wasmJsRun
```
2 changes: 1 addition & 1 deletion app-wasm/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl

plugins {
kotlin("multiplatform")
Expand Down
2 changes: 1 addition & 1 deletion app-wasm/src/commonMain/composeResources/files/aboutlibraries.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dokka = "1.9.20"
kotlinCore = { require = "2.0.21" }
kotlinCoroutines = { require = "1.9.0" }
kotlinxSerialization = "1.7.3"
kotlinxCollections = "0.3.7"
kotlinxCollections = "0.3.8"
# compose
compose = "1.7.5"
compose-plugin = "1.7.1"
Expand Down Expand Up @@ -48,7 +48,9 @@ mavenPublish = { id = "com.vanniktech.maven.publish", version.ref = "gradleMvnPu
[libraries]
# build
gradle-build = { module = "com.android.tools.build:gradle", version.ref = "gradleBuild" }
android-lint-gradle = { module = "androidx.lint:lint-gradle", version = "1.0.0-alpha02" }
# kotlin
android-lint-plug = { module = "com.android.lint:com.android.lint.gradle.plugin", version.ref = "gradleBuild" }
dokka-plug = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" }
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlinCore" }
kotlin-plug = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinCore" }
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
1 change: 1 addition & 0 deletions plugin-build/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ buildscript {
}

dependencies {
classpath(libs.android.lint.plug.get())
classpath(libs.kotlin.plug.get())
classpath(libs.dokka.plug)
}
Expand Down
5 changes: 5 additions & 0 deletions plugin-build/plugin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
plugins {
id "com.android.lint"
id "org.jetbrains.kotlin.jvm"
id "com.gradle.plugin-publish" version "0.20.0"
id "java-gradle-plugin"
id "maven-publish"
id "org.jetbrains.dokka"
}


group = "com.mikepenz.aboutlibraries.plugin"
version = rootProject.properties["version"]

Expand Down Expand Up @@ -60,6 +62,9 @@ dependencies {

// add better android support
compileOnly(libs.gradle.build)

// lint rules
lintChecks(libs.android.lint.gradle)
}

// generate zip file for android maven release tool
Expand Down
Loading
Loading