chore: update dependencies and project configuration

.devcontainer/Dockerfile

@@ -0,0 +1,44 @@
+FROM mcr.microsoft.com/devcontainers/java:17-bookworm
+
+# Always start as root for provisioning
+USER root
+ENV DEBIAN_FRONTEND=noninteractive
+
+# ---- System dependencies ----
+# Remove yarn repository to avoid GPG key errors
+RUN rm -f /etc/apt/sources.list.d/yarn.list \
+    && rm -rf /var/lib/apt/lists/* \
+    && apt-get update \
+    && apt-get install -y --no-install-recommends \
+        curl \
+        unzip \
+        zip \
+        libglu1-mesa \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# ---- Android SDK env ----
+ENV ANDROID_SDK_ROOT=/usr/local/android-sdk
+ENV ANDROID_HOME=${ANDROID_SDK_ROOT}
+ENV PATH=${PATH}:${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin:${ANDROID_SDK_ROOT}/platform-tools
+
+# ---- Android command line tools ----
+RUN mkdir -p ${ANDROID_SDK_ROOT}/cmdline-tools \
+    && curl -fsSL https://dl.google.com/android/repository/commandlinetools-linux-14742923_latest.zip -o /tmp/cmdline-tools.zip \
+    && unzip /tmp/cmdline-tools.zip -d ${ANDROID_SDK_ROOT}/cmdline-tools \
+    && mv ${ANDROID_SDK_ROOT}/cmdline-tools/cmdline-tools ${ANDROID_SDK_ROOT}/cmdline-tools/latest \
+    && rm /tmp/cmdline-tools.zip
+
+# ---- SDK packages ----
+RUN yes | sdkmanager --licenses \
+    && sdkmanager --update \
+    && sdkmanager \
+        "platform-tools" \
+        "platforms;android-36" \
+        "build-tools;36.0.0"
+
+# ---- Permissions (CRITICAL) ----
+RUN chown -R vscode:vscode ${ANDROID_SDK_ROOT}
+
+# Drop privileges
+USER vscode

.devcontainer/devcontainer.json

@@ -0,0 +1,23 @@
+{
+  "name": "Java + Android",
+  "build": {
+    "dockerfile": "Dockerfile"
+  },
+  "features": {
+    "ghcr.io/devcontainers/features/java:1": {
+      "version": "17",
+      "installGradle": true
+    }
+  },
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "GitHub.copilot",
+        "oderwat.indent-rainbow",
+        "redhat.vscode-yaml",
+        "vscjava.vscode-java-pack"
+      ]
+    }
+  },
+  "remoteUser": "vscode"
+}

.gitignore

@@ -2,7 +2,8 @@
 .gradle
 /local.properties
 .DS_Store
-/build
+build
+.kotlin
 /captures
 .externalNativeBuild
 .cxx
@@ -11,5 +12,3 @@ local.properties
 # Ignore all files in the .idea directory except for name
 .idea/*
 !.idea/.name
-
-.kotlin/*

build.gradle.kts

@@ -3,38 +3,14 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    alias(libs.plugins.agp) apply false
-    alias(libs.plugins.kotlin.android) apply false
-    alias(libs.plugins.android.library) apply false
-    alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.hilt.android) apply false
-    alias(libs.plugins.spotless) apply false
 }
 
 subprojects {
-    apply(plugin = "com.diffplug.spotless")
     tasks.withType<KotlinCompile>().configureEach {
         compilerOptions {
             jvmTarget.set(JvmTarget.JVM_17)
         }
     }
-    configure<com.diffplug.gradle.spotless.SpotlessExtension> {
-        kotlin {
-            target("**/*.kt", "**/*.kts")
-            targetExclude("**/build/**/*.kt")
-            ktlint(libs.ktlint.core.get().version).editorConfigOverride(
-                mapOf(
-                    "ktlint_standard_annotation" to "disabled",
-                ),
-            )
-            trimTrailingWhitespace()
-            endWithNewline()
-        }
-        format("xml") {
-            target("**/*.xml")
-            trimTrailingWhitespace()
-            endWithNewline()
-        }
-    }
 }

buildSrc/build.gradle.kts

@@ -0,0 +1,20 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    gradlePluginPortal()
+    mavenCentral()
+    google()
+}
+
+dependencies {
+    implementation(libs.androidx.gradle)
+    implementation(libs.kotlin.gradle)
+    implementation(libs.compose.compiler.gradle)
+    implementation(libs.spotless.gradle)
+    implementation(gradleApi())
+
+    // workaround to enable version catalogs (libs) in buildSrc
+    implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
+}

buildSrc/settings.gradle.kts

@@ -0,0 +1,9 @@
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}
+
+rootProject.name = "ComposeFloatingWindow-buildSrc"

buildSrc/src/main/kotlin/android.application.gradle.kts

@@ -0,0 +1,15 @@
+import buildlogic.AndroidConfig
+import buildlogic.configureAndroid
+
+plugins {
+    id("com.android.application")
+    id("org.jetbrains.kotlin.plugin.compose")
+    id("code.lint")
+}
+
+android {
+    defaultConfig {
+        targetSdk = AndroidConfig.TARGET_SDK
+    }
+    configureAndroid(this)
+}

buildSrc/src/main/kotlin/buildLogic/AndroidConfig.kt

@@ -0,0 +1,14 @@
+package buildlogic
+
+import org.gradle.api.JavaVersion as GradleJavaVersion
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget as KotlinJvmTarget
+
+object AndroidConfig {
+    const val COMPILE_SDK = 36
+    const val TARGET_SDK = 36
+    const val MIN_SDK = 24
+
+    // https://youtrack.jetbrains.com/issue/KT-66995/JvmTarget-and-JavaVersion-compatibility-for-easier-JVM-version-setup
+    val JavaVersion = GradleJavaVersion.VERSION_17
+    val JvmTarget = KotlinJvmTarget.JVM_17
+}

buildSrc/src/main/kotlin/buildLogic/ProjectExtensions.kt

@@ -0,0 +1,23 @@
+package buildlogic
+
+import com.android.build.api.dsl.CommonExtension
+import org.gradle.accessors.dm.LibrariesForLibs
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.the
+
+val Project.libs get() = the<LibrariesForLibs>()
+
+internal fun configureAndroid(commonExtension: CommonExtension) {
+    commonExtension.apply {
+        compileSdk = AndroidConfig.COMPILE_SDK
+
+        defaultConfig.apply {
+            minSdk = AndroidConfig.MIN_SDK
+        }
+
+        compileOptions.apply {
+            sourceCompatibility = AndroidConfig.JavaVersion
+            targetCompatibility = AndroidConfig.JavaVersion
+        }
+    }
+}

buildSrc/src/main/kotlin/code.lint.gradle.kts

@@ -0,0 +1,25 @@
+import org.gradle.accessors.dm.LibrariesForLibs
+
+plugins {
+    id("com.diffplug.spotless")
+}
+
+val libs = the<LibrariesForLibs>()
+
+
+spotless {
+    kotlin {
+        target("**/*.kt", "**/*.kts")
+        targetExclude("**/build/**/*.kt")
+        ktlint(libs.ktlint.core.get().version).editorConfigOverride(
+            mapOf("ktlint_standard_annotation" to "disabled")
+        )
+        trimTrailingWhitespace()
+        endWithNewline()
+    }
+    format("xml") {
+        target("**/*.xml")
+        trimTrailingWhitespace()
+        endWithNewline()
+    }
+}

buildSrc/src/main/kotlin/library.gradle.kts

@@ -0,0 +1,15 @@
+import buildlogic.AndroidConfig
+import buildlogic.configureAndroid
+
+plugins {
+    id("com.android.library")
+    id("org.jetbrains.kotlin.plugin.compose")
+    id("code.lint")
+}
+
+android {
+    defaultConfig {
+        lint.targetSdk = AndroidConfig.TARGET_SDK
+    }
+    configureAndroid(this)
+}

gradle/libs.versions.toml

@@ -3,15 +3,15 @@ compile-sdk = "36"
 target-sdk = "36"
 min-sdk = "24"
 
-agp = "8.13.2"
+agp = "9.0.0"
 kotlin = "2.3.0"
 
 android-core-ktx = "1.17.0"
 appcompat = "1.7.1"
 lifecycle = "2.10.0"
 activity-compose = "1.12.2"
 
-compose-bom = "2026.01.00"
+compose-bom = "2026.01.01"
 
 junit = "4.13.2"
 
@@ -22,8 +22,8 @@ google-material = "1.13.0"
 
 leakcanary = "2.14"
 
-hilt = "2.58"
-ksp = "2.3.4"
+hilt = "2.59"
+ksp = "2.3.5"
 
 datastore = "1.2.0"
 
@@ -68,6 +68,16 @@ ktlint-core = { module = "com.pinterest.ktlint:ktlint-cli", version.ref = "ktlin
 
 kotlin-metadata = { module = "org.jetbrains.kotlin:kotlin-metadata-jvm", version = "2.3.0" }
 
+#
+# Gradle libraries
+#
+
+androidx-gradle = { module = "com.android.tools.build:gradle", version.ref = "agp" }
+kotlin-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
+compose-compiler-gradle = { module = "org.jetbrains.kotlin:compose-compiler-gradle-plugin", version.ref = "kotlin" }
+
+spotless-gradle = { group = "com.diffplug.spotless", name = "spotless-plugin-gradle", version.ref = "spotless" }
+
 [plugins]
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 agp = { id = "com.android.application", version.ref = "agp" }

gradle/wrapper/gradle-wrapper.properties

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

library/build.gradle.kts

@@ -1,20 +1,10 @@
 plugins {
-    id("com.android.library")
-    kotlin("android")
     `maven-publish`
-    alias(libs.plugins.compose.compiler)
+    id("library")
 }
 
 android {
     namespace = "com.github.only52607.compose.window"
-    compileSdk = libs.versions.compile.sdk.get().toInt()
-
-    defaultConfig {
-        minSdk = libs.versions.min.sdk.get().toInt()
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
-    }
 
     buildTypes {
         release {
@@ -25,10 +15,6 @@ android {
             )
         }
     }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
     buildFeatures {
         compose = true
     }

samples/app-activity/build.gradle.kts

@@ -1,17 +1,12 @@
 plugins {
-    alias(libs.plugins.agp)
-    alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.compose.compiler)
+    id("android.application")
 }
 
 android {
     namespace = "io.github.arthurkun.app.activity"
-    compileSdk = libs.versions.compile.sdk.get().toInt()
 
     defaultConfig {
         applicationId = "io.github.arthurkun.floating.window"
-        minSdk = libs.versions.min.sdk.get().toInt()
-        targetSdk = libs.versions.target.sdk.get().toInt()
         versionCode = 1
         versionName = "1.0"
 
@@ -28,10 +23,6 @@ android {
             signingConfig = signingConfigs.getByName("debug")
         }
     }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
     buildFeatures {
         compose = true
     }