Update dependencies

build.gradle.kts

@@ -1,12 +1,12 @@
-// TODO: get plugins from version catalog once this issue is tackled: https://youtrack.jetbrains.com/issue/KTIJ-19369
 @Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage")
 plugins {
-    id("com.android.application").version("7.1.1").apply(false)
-    id("com.android.library").version("7.1.1").apply(false)
-    id("org.jetbrains.kotlin.android").version("1.6.10").apply(false)
-    kotlin("plugin.serialization") version "1.6.10"
-    id(Plugins.ktlint).version(libs.plugins.ktlint.get().version.toString())
-    id(Plugins.detekt).version(libs.plugins.detekt.get().version.toString())
+    alias(libs.plugins.application).apply(false)
+    alias(libs.plugins.library).apply(false)
+    alias(libs.plugins.kotlin).apply(false)
+    alias(libs.plugins.compose.compiler).apply(false)
+    alias(libs.plugins.serialization).apply(false)
+    alias(libs.plugins.ktlint).apply(true)
+    alias(libs.plugins.detekt).apply(true)
 }
 
 buildscript {

buildSrc/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    kotlin("jvm") version "1.6.10"
+    kotlin("jvm") version "2.0.21"
 }
 
 repositories {

buildSrc/src/main/kotlin/ModuleExtension.kt

@@ -1,6 +1,6 @@
 object ModuleExtension {
     const val compileSdkVersion = 31
-    const val jvmTarget = "1.8"
+    const val jvmTarget = "11"
 
     object DefaultConfigs {
         const val minSdkVersion = 23
@@ -14,8 +14,8 @@ object ModuleExtension {
     object App {
         const val applicationIdCanvas = "nstv.sheep.canvas"
         const val applicationIdAnimations = "nstv.sheep.animations"
-        const val versionName = "1.0"
-        const val versionCode = 1
+        const val versionName = "1.1"
+        const val versionCode = 2
     }
 
     object FilePath {

canvasExtensions/build.gradle.kts

@@ -1,10 +1,12 @@
 plugins {
     id(Plugins.library)
     kotlin(Plugins.android)
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
     compileSdk = ModuleExtension.compileSdkVersion
+    namespace = "nstv.canvasExtensions"
 
     defaultConfig {
         minSdk = ModuleExtension.DefaultConfigs.minSdkVersion

canvasExtensions/src/main/java/nstv/canvasExtensions/maths/GeometryMaths.kt

@@ -9,6 +9,8 @@ import kotlin.math.sin
 import kotlin.math.sqrt
 
 val FullCircleAngleInRadians = Math.toRadians(360.0)
+fun Double.toRadians() = PI * this / 180.0
+
 
 /**
  * Returns a point in a circumference given the angle from the x axis in radians,

design/build.gradle.kts

@@ -1,10 +1,12 @@
 plugins {
     id(Plugins.library)
     kotlin(Plugins.android)
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
     compileSdk = ModuleExtension.compileSdkVersion
+    namespace = "nstv.design"
 
     defaultConfig {
         minSdk = ModuleExtension.DefaultConfigs.minSdkVersion
@@ -33,9 +35,7 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.core.get()
-    }
+
     packagingOptions {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"

gradle/libs.versions.toml

@@ -4,6 +4,7 @@ coroutines = "1.5.2"
 serialization = "1.3.2"
 
 #android
+agp = "8.7.1"
 material = "1.5.0"
 material3 = "1.0.0-alpha10"
 hilt = "2.40.5"
@@ -30,8 +31,8 @@ coroutinesTest = "1.5.2"
 mockWebServer = "4.9.3"
 
 #plugins
-gradle = "7.1.1"
-kotlin = "1.6.10"
+gradle = "8.9.0"
+kotlin = "2.0.21"
 ktlint = "10.2.1"
 detekt = "1.19.0"
 
@@ -122,9 +123,15 @@ accompanist = [
 ]
 
 [plugins]
+application = { id = "com.android.application", version.ref = "agp" }
+library = { id = "com.android.library", version.ref = "agp" }
+android = { id = "com.android", version.ref = "agp" }
+kapt = { id = "kotlin-kapt", version.ref = "kotlin" }
+parcelize = { id = "kotlin-parcelize", version.ref = "kotlin" }
+serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
+dagger-hilt = { id = "dagger.hilt.android.plugin", version.ref = "hilt" }
+ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" }
+detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
-application = { id = "com.android.application", version.ref = "gradle" }
-library = { id = "com.android.library", version.ref = "gradle" }
-ktlint = { id = "org.jlleitschuh.gradle:ktlint-gradle", version.ref = "ktlint" }
-detekt = { id = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Apr 25 21:06:25 CEST 2022
+#Wed Oct 30 00:12:49 CET 2024
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

settings.gradle

@@ -6,7 +6,6 @@ pluginManagement {
     }
 }
 
-enableFeaturePreview("VERSION_CATALOGS")
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 dependencyResolutionManagement {

sheep/build.gradle.kts

@@ -1,10 +1,12 @@
 plugins {
     id(Plugins.library)
     kotlin(Plugins.android)
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
     compileSdk = ModuleExtension.compileSdkVersion
+    namespace = "nstv.sheep"
 
     defaultConfig {
         minSdk = ModuleExtension.DefaultConfigs.minSdkVersion
@@ -24,9 +26,6 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.core.get()
-    }
     packagingOptions {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"

sheepAnimations/build.gradle.kts

@@ -5,10 +5,12 @@ plugins {
     id(Plugins.parcelize)
     id(Plugins.daggerHilt)
     kotlin(Plugins.serialize)
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
     compileSdk = ModuleExtension.compileSdkVersion
+    namespace = "nstv.sheepanimations"
     defaultConfig {
         applicationId = ModuleExtension.App.applicationIdAnimations
         minSdk = ModuleExtension.DefaultConfigs.minSdkVersion
@@ -32,8 +34,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
     kotlinOptions {
         jvmTarget = ModuleExtension.jvmTarget

sheepCanvas/build.gradle.kts

@@ -5,10 +5,13 @@ plugins {
     id(Plugins.parcelize)
     id(Plugins.daggerHilt)
     kotlin(Plugins.serialize)
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
     compileSdk = ModuleExtension.compileSdkVersion
+    namespace = "nstv.sheepcanvas"
+
     defaultConfig {
         applicationId = ModuleExtension.App.applicationIdCanvas
         minSdk = ModuleExtension.DefaultConfigs.minSdkVersion
@@ -32,18 +35,16 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
     kotlinOptions {
         jvmTarget = ModuleExtension.jvmTarget
     }
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.core.get()
-    }
+
     packagingOptions {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"