deepmedia · natario1 · Aug 24, 2024 · Aug 20, 2024
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,6 +14,6 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 17
       - name: Perform base checks
         run: ./gradlew build publishToDirectory
diff --git a/.gitignore b/.gitignore
@@ -1,12 +1,7 @@
 *.iml
 .gradle
 /local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
+/.idea/
 .DS_Store
 /build
 /captures

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,31 +1,4 @@
-buildscript {
-    repositories {
-        maven("build/maven")
-        maven("https://dl.bintray.com/deepmedia/tools/")
-        google()
-        jcenter()
-    }
-
-    configurations.configureEach {
-        resolutionStrategy.cacheChangingModulesFor(10, TimeUnit.SECONDS)
-    }
-
-    dependencies {
-        classpath("io.deepmedia.tools:publisher:0.4.0")
-        classpath("io.deepmedia.tools:grease:0.2.0") {
-            isChanging = true
-        }
-    }
-}
-
-allprojects {
-    repositories {
-        mavenCentral()
-        google()
-        jcenter()
-    }
-}
-
-tasks.register("clean", Delete::class) {
-    delete(buildDir)
-}
+plugins {
+    alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.kotlin.jvm) apply false
+}
diff --git a/gradle.properties b/gradle.properties
@@ -15,7 +15,5 @@ org.gradle.jvmargs=-Xmx1536m
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -0,0 +1,23 @@
+[versions]
+agp = "8.1.4"
+asm-commons = "9.6"
+android-tools = "31.1.4"
+kotlin = "2.0.0"
+shadow = "8.3.0"
+publisher = "0.14.0"
+
+[libraries]
+asm-commons = { module = "org.ow2.asm:asm-commons", version.ref = "asm-commons" }
+gradle-android-common = { module = "com.android.tools:common", version.ref = "android-tools" }
+gradle-android-sdk-common = { module = "com.android.tools:sdk-common", version.ref = "android-tools" }
+gradle-android-layoutlib = { module = "com.android.tools.layoutlib:layoutlib-api", version.ref = "android-tools" }
+gradle-android-build = { module = "com.android.tools.build:gradle", version.ref = "agp" }
+gradle-shadow = { module = "com.gradleup.shadow:shadow-gradle-plugin", version.ref = "shadow" }
+
+[bundles]
+gradle-android = ["gradle-android-sdk-common", "gradle-android-build", "gradle-android-common", "gradle-android-layoutlib"]
+
+[plugins]
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+publisher = { id = "io.deepmedia.tools.deployer", version.ref = "publisher" }
+android-library = { id = "com.android.library", version.ref = "agp" }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Wed Mar 18 11:56:36 BRT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip