Merge development into master

.editorconfig

@@ -11,3 +11,5 @@ indent_size = 2
 [*.{kts,kt}]
 ij_kotlin_allow_trailing_comma = true
 ij_kotlin_allow_trailing_comma_on_call_site = true
+ktlint_function_naming_ignore_when_annotated_with = Composable
+max_line_length = 120

.github/workflows/build-debug-apk.yml

@@ -6,8 +6,8 @@ jobs:
   build-debug-apk:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: zulu

.github/workflows/release-update.yml

@@ -8,10 +8,10 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           path: vico
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: zulu
@@ -54,19 +54,3 @@ jobs:
           ORG_GRADLE_PROJECT_GPG_KEY: ${{ secrets.GPG_KEY }}
           ORG_GRADLE_PROJECT_GPG_KEY_PASSWORD: ${{ secrets.GPG_KEY_PASSWORD }}
           ORG_GRADLE_PROJECT_OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
-      - run: |
-          cd "${{ github.workspace }}/vico"
-          ./gradlew clean
-          rm -r sample README.md logo-styles.css .github
-          find . -not -path "*/.*" -type d -name patrykandpatrick | while read path; do mv "$path" "$(sed s/patrykandpatrick/patrykandpatryk/ <<< "$path")"; done
-          mv vico/views vico/view
-          mv vico/view/src/main/java/com/patrykandpatryk/vico/views vico/view/src/main/java/com/patrykandpatryk/vico/view
-          find . -not -path "*/.*" -type f | while read path; do sed -i "s/com\.patrykandpatrick/com\.patrykandpatryk/" "$path"; done
-          find . -not -path "*/.*" -type f | while read path; do sed -i "s/vico\.views/vico\.view/" "$path"; done
-          find -type f \( -name "*.gradle" -o -name "*.gradle.kts" \) -exec sed -i s/vico:views/vico:view/ "{}" +
-          sed -i "s/\(username\s*=\s*\)\"patrykandpatrick\"/\1\"patrykandpatryk\"/" common-scripts.gradle
-          ./gradlew publish
-        env:
-          ORG_GRADLE_PROJECT_GPG_KEY: ${{ secrets.LEGACY_GPG_KEY }}
-          ORG_GRADLE_PROJECT_GPG_KEY_PASSWORD: ${{ secrets.LEGACY_GPG_KEY_PASSWORD }}
-          ORG_GRADLE_PROJECT_OSSRH_PASSWORD: ${{ secrets.LEGACY_OSSRH_PASSWORD }}

.github/workflows/run-ktlint.yml

@@ -0,0 +1,19 @@
+name: Run Ktlint
+on:
+  push:
+  pull_request:
+jobs:
+  run-ktlint:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+      - uses: actions/setup-java@v4
+        with:
+          java-version: 17
+          distribution: zulu
+      - run: |
+          curl -sSLO https://github.com/pinterest/ktlint/releases/download/1.0.1/ktlint
+          chmod +x ktlint
+          sudo mv ktlint /usr/local/bin
+      - uses: actions/checkout@v4
+      - run: ktlint

.github/workflows/run-tests.yml

@@ -9,7 +9,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           lfs: true
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: adopt

build.gradle.kts

@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-import io.gitlab.arturbosch.detekt.Detekt
-
 buildscript {
     dependencies {
         classpath(libs.buildTools)
@@ -24,25 +22,8 @@ buildscript {
     }
 }
 
-plugins {
-    alias(libs.plugins.detekt)
-    alias(libs.plugins.dokka) apply false
-}
+plugins { alias(libs.plugins.dokka) apply false }
 
 apply("versions.gradle")
 
-dependencies { detektPlugins(libs.detektFormatting) }
-
 tasks.register<Delete>("clean") { delete(rootProject.layout.buildDirectory) }
-
-tasks.register<Detekt>("detektFix") { autoCorrect = true }
-
-tasks.withType<Detekt>().configureEach {
-    source = fileTree(projectDir)
-    config = files(".idea/detekt-config.yml")
-    buildUponDefaultConfig = true
-    reports.html {
-        required = true
-        outputLocation = file("build/reports/detekt/detekt.html")
-    }
-}

gradle/libs.versions.toml

@@ -1,18 +1,17 @@
 [versions]
 accompanist = "0.32.0"
-activity = "1.8.0"
-agp = "8.3.0-alpha14"
+activity = "1.8.1"
+agp = "8.3.0-alpha17"
 androidXAnnotation = "1.7.0"
 androidXCore = "1.12.0"
 appcompat = "1.6.1"
 composeBom = "2023.10.01"
-composeCompiler = "1.5.4"
+composeCompiler = "1.5.6"
 coroutines = "1.7.3"
-detekt = "1.23.3"
 dokka = "1.9.10"
 jUnit = "4.13.2"
 jUnitExt = "1.1.5"
-kotlin = "1.9.20"
+kotlin = "1.9.21"
 lifecycle = "2.6.2"
 material = "1.10.0"
 mockK = "1.13.7"
@@ -33,7 +32,6 @@ composeUI = { group = "androidx.compose.ui", name = "ui" }
 composeUITooling = { group = "androidx.compose.ui", name = "ui-tooling" }
 composeViewBinding = { group = "androidx.compose.ui", name = "ui-viewbinding" }
 coroutinesCore = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "coroutines" }
-detektFormatting = { group = "io.gitlab.arturbosch.detekt", name = "detekt-formatting", version.ref = "detekt" }
 jUnit = { group = "junit", name = "junit", version.ref = "jUnit" }
 jUnitExt = { group = "androidx.test.ext", name = "junit", version.ref = "jUnitExt" }
 kotlinGradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
@@ -48,5 +46,4 @@ testCore = { group = "androidx.test", name = "core-ktx", version.ref = "testCore
 viewModelCompose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycle" }
 
 [plugins]
-detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
 dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -145,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -202,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

sample/src/main/java/com/patrykandpatrick/vico/sample/MainActivity.kt

@@ -22,7 +22,6 @@ import androidx.activity.compose.setContent
 import androidx.core.view.WindowCompat
 
 internal class MainActivity : ComponentActivity() {
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         WindowCompat.setDecorFitsSystemWindows(window, false)

sample/src/main/java/com/patrykandpatrick/vico/sample/VicoApp.kt

@@ -42,9 +42,10 @@ internal fun VicoApp() {
     }
     VicoTheme {
         Box(
-            modifier = Modifier
-                .fillMaxSize()
-                .background(color = MaterialTheme.colorScheme.background),
+            modifier =
+                Modifier
+                    .fillMaxSize()
+                    .background(color = MaterialTheme.colorScheme.background),
         ) { ShowcaseScreen() }
     }
 }