Gradle build script updates

sksamuel · Dec 3, 2024 · a86cbda · a86cbda
1 parent d092a2a
commit a86cbda
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 28 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,37 +1,17 @@
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 
-buildscript {
-   repositories {
-      mavenCentral()
-      maven {
-         url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
-      }
-      maven {
-         url = uri("https://plugins.gradle.org/m2/")
-      }
-   }
-}
-
 plugins {
    signing
    `maven-publish`
-   kotlin("jvm").version("1.9.25")
+   kotlin("jvm")
 }
 
-allprojects {
+subprojects {
    apply(plugin = "org.jetbrains.kotlin.jvm")
 
    group = "com.sksamuel.aedile"
    version = Ci.version
 
-   repositories {
-      mavenLocal()
-      mavenCentral()
-      maven {
-         url = uri("https://oss.sonatype.org/content/repositories/snapshots")
-      }
-   }
-
    dependencies {
       api(rootProject.libs.coroutines.core)
       api(rootProject.libs.coroutines.jdk8)
@@ -51,9 +31,12 @@ allprojects {
       toolchain {
          languageVersion.set(JavaLanguageVersion.of(11))
       }
+      withSourcesJar()
    }
 
    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
       kotlinOptions.jvmTarget = "11"
+      kotlinOptions.apiVersion = "1.9"
+      kotlinOptions.languageVersion = "1.9"
    }
 }
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.gradle.kotlin.dsl.`kotlin-dsl`
 
 repositories {
-   jcenter()
+   mavenCentral()
 }
 
 plugins {

diff --git a/publish.gradle.kts b/publish.gradle.kts
@@ -3,10 +3,6 @@ apply(plugin = "java-library")
 apply(plugin = "maven-publish")
 apply(plugin = "signing")
 
-repositories {
-  mavenCentral()
-}
-
 val signingKey: String? by project
 val signingPassword: String? by project
 
@@ -57,7 +53,7 @@ publishing {
       from(components["java"])
       pom {
         name.set("aedile")
-        description.set("Kotlin Cache")
+        description.set("Kotlin Wrapper for Caffeine")
         url.set("http://www.github.com/sksamuel/aedile")
 
         scm {

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,3 +1,13 @@
+pluginManagement {
+   repositories {
+      gradlePluginPortal()
+      mavenCentral()
+   }
+   plugins {
+      kotlin("jvm").version("1.9.25")
+   }
+}
+
 rootProject.name = "aedile"
 
 include(
@@ -9,6 +19,13 @@ enableFeaturePreview("STABLE_CONFIGURATION_CACHE")
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 dependencyResolutionManagement {
+   repositoriesMode = RepositoriesMode.FAIL_ON_PROJECT_REPOS
+   repositories {
+      mavenCentral()
+      mavenLocal()
+      maven("https://oss.sonatype.org/content/repositories/snapshots/")
+      maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
+   }
    versionCatalogs {
       create("libs") {