diff --git a/.gitignore b/.gitignore
index 1e1d8a6..c43ffa3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,9 +45,11 @@
# Kotlin
.kotlin
+.idea/kotlinc.xml
# Misc
.idea/misc.xml
+.idea/markdown.xml
# CMake
cmake-build-*/
@@ -91,6 +93,8 @@ fabric.properties
.idea/androidTestResultsUserPreferences.xml
# Android projects
+.idea/AndroidProjectSystem.xml
+.idea/deviceManager.xml
**/local.properties
/captures
.externalNativeBuild
@@ -106,5 +110,11 @@ site
*.bak
.idea/appInsightsSettings.xml
+# Discord plugin for IntelliJ
+.idea/discord.xml
+
+# Copilot for IntelliJ
+.idea/copilot**
+
# Mac OS
.DS_Store
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 146ab09..807a7e6 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -6,5 +6,6 @@
+
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index fef3052..c361afe 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,9 +1,9 @@
import org.jetbrains.dokka.gradle.DokkaTask
plugins {
- autowire(libs.plugins.kotlin.jvm) apply false
- autowire(libs.plugins.kotlin.dokka) apply false
- autowire(libs.plugins.maven.publish) apply false
+ alias(libs.plugins.kotlin.jvm) apply false
+ alias(libs.plugins.kotlin.dokka) apply false
+ alias(libs.plugins.maven.publish) apply false
}
libraryProjects {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 0000000..a0785e6
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,14 @@
+[versions]
+kotlin = "2.0.10"
+dokka = "1.9.20"
+maven-publish = "0.34.0"
+slf4j = "2.0.17"
+
+[plugins]
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+kotlin-dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
+maven-publish = { id = "com.vanniktech.maven.publish", version.ref = "maven-publish" }
+
+[libraries]
+slf4j-api = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j" }
+slf4j-simple = { group = "org.slf4j", name = "slf4j-simple", version.ref = "slf4j" }
\ No newline at end of file
diff --git a/gradle/sweet-dependency/sweet-dependency-config.yaml b/gradle/sweet-dependency/sweet-dependency-config.yaml
deleted file mode 100644
index e9b73e6..0000000
--- a/gradle/sweet-dependency/sweet-dependency-config.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-preferences:
- autowire-on-sync-mode: UPDATE_OPTIONAL_DEPENDENCIES
- repositories-mode: FAIL_ON_PROJECT_REPOS
-
-repositories:
- gradle-plugin-portal:
- scope: PLUGINS
- google:
- maven-central:
-
-plugins:
- org.jetbrains.kotlin.jvm:
- alias: kotlin-jvm
- # For compatibility with Android projects.
- version: 2.0.10
- auto-update: false
- org.jetbrains.dokka:
- alias: kotlin-dokka
- version: 1.9.20
- auto-update: false
- com.vanniktech.maven.publish:
- alias: maven-publish
- version: 0.34.0
-
-libraries:
- org.slf4j:
- slf4j-api:
- version: 2.0.17
- slf4j-simple:
- version-ref: ::slf4j-api
\ No newline at end of file
diff --git a/kavaref-android-stub/build.gradle.kts b/kavaref-android-stub/build.gradle.kts
index c1eb18f..2ed0b40 100644
--- a/kavaref-android-stub/build.gradle.kts
+++ b/kavaref-android-stub/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
id("java")
}
-group = property.project.groupName
+group = gropify.project.groupName
java {
sourceCompatibility = JavaVersion.VERSION_17
diff --git a/kavaref-core/build.gradle.kts b/kavaref-core/build.gradle.kts
index ad4d50d..209d831 100644
--- a/kavaref-core/build.gradle.kts
+++ b/kavaref-core/build.gradle.kts
@@ -1,11 +1,11 @@
plugins {
- autowire(libs.plugins.kotlin.jvm)
- autowire(libs.plugins.kotlin.dokka)
- autowire(libs.plugins.maven.publish)
+ alias(libs.plugins.kotlin.jvm)
+ alias(libs.plugins.kotlin.dokka)
+ alias(libs.plugins.maven.publish)
}
-group = property.project.groupName
-version = property.project.kavaref.core.version
+group = gropify.project.groupName
+version = gropify.project.kavaref.core.version
java {
sourceCompatibility = JavaVersion.VERSION_17
@@ -30,5 +30,5 @@ dependencies {
compileOnly(projects.kavarefAndroidStub)
implementation(projects.kavarefExtension)
- implementation(org.slf4j.slf4j.api)
+ implementation(libs.slf4j.api)
}
\ No newline at end of file
diff --git a/kavaref-extension/build.gradle.kts b/kavaref-extension/build.gradle.kts
index 8d28556..94e6d28 100644
--- a/kavaref-extension/build.gradle.kts
+++ b/kavaref-extension/build.gradle.kts
@@ -1,11 +1,11 @@
plugins {
- autowire(libs.plugins.kotlin.jvm)
- autowire(libs.plugins.kotlin.dokka)
- autowire(libs.plugins.maven.publish)
+ alias(libs.plugins.kotlin.jvm)
+ alias(libs.plugins.kotlin.dokka)
+ alias(libs.plugins.maven.publish)
}
-group = property.project.groupName
-version = property.project.kavaref.extension.version
+group = gropify.project.groupName
+version = gropify.project.kavaref.extension.version
java {
sourceCompatibility = JavaVersion.VERSION_17
diff --git a/samples/kavaref-demo/build.gradle.kts b/samples/kavaref-demo/build.gradle.kts
index 01e1f59..cdf14c3 100644
--- a/samples/kavaref-demo/build.gradle.kts
+++ b/samples/kavaref-demo/build.gradle.kts
@@ -1,9 +1,9 @@
plugins {
- autowire(libs.plugins.kotlin.jvm)
+ alias(libs.plugins.kotlin.jvm)
}
-group = property.project.samples.kavaref.demo.groupName
-version = property.project.samples.kavaref.demo.version
+group = gropify.project.samples.kavaref.demo.groupName
+version = gropify.project.samples.kavaref.demo.version
java {
sourceCompatibility = JavaVersion.VERSION_17
@@ -27,5 +27,5 @@ dependencies {
implementation(projects.kavarefExtension)
// SLF4J Simple Logger
- implementation(org.slf4j.slf4j.simple)
+ implementation(libs.slf4j.simple)
}
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 9581a21..51a82bb 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -8,29 +8,32 @@ pluginManagement {
}
}
+dependencyResolutionManagement {
+ repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+ repositories {
+ google()
+ mavenCentral()
+ }
+}
+
plugins {
- id("com.highcapable.sweetdependency") version "1.0.4"
- id("com.highcapable.sweetproperty") version "1.0.8"
+ id("com.highcapable.gropify") version "1.0.0"
}
-sweetDependency {
- isEnableVerboseMode = false
-}
-
-sweetProperty {
+gropify {
global {
- sourcesCode {
+ jvm {
includeKeys(
"^project\\..*\$".toRegex(),
"^gradle\\..*\$".toRegex()
)
- isEnableRestrictedAccess = true
+ isRestrictedAccessEnabled = true
}
}
rootProject {
- all {
- isEnable = false
+ common {
+ isEnabled = false
}
}
}