Get it building

Commit451 · Nov 5, 2024 · a6763c2 · a6763c2
1 parent a2e8d5c
commit a6763c2
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 21 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,20 +2,14 @@ buildscript {
     repositories {
         google()
         mavenCentral()
-        maven("https://plugins.gradle.org/m2/")
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.2.0")
-        classpath("org.jlleitschuh.gradle:ktlint-gradle:10.3.0")
+        classpath(kotlin("gradle-plugin", version = "1.9.20"))
+        classpath("com.android.tools.build:gradle:8.7.2")
         classpath("com.vanniktech:gradle-maven-publish-plugin:0.19.0")
-        classpath(kotlin("gradle-plugin", version = "1.6.21"))
     }
 }
 
-plugins {
-    id("com.github.ben-manes.versions") version "0.42.0"
-}
-
 allprojects {
     repositories {
         google()

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
@@ -5,10 +5,10 @@ import coiltransformations.targetSdk
 plugins {
     id("com.android.application")
     id("kotlin-android")
-    id("org.jlleitschuh.gradle.ktlint")
 }
 
 android {
+    namespace = "com.commit451.coiltransformations.sample"
     compileSdk = project.targetSdk
     defaultConfig {
         applicationId = "com.commit451.coiltransformations.sample"

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,7 +1,7 @@
 rootProject.buildFileName = "build.gradle.kts"
 include(
-        ":transformations",
-        ":transformations-face-detection",
-        ":transformations-gpu",
-        ":sample"
+    ":transformations",
+    ":transformations-face-detection",
+    ":transformations-gpu",
+    ":sample"
 )
diff --git a/transformations-face-detection/build.gradle.kts b/transformations-face-detection/build.gradle.kts
@@ -5,12 +5,12 @@ import coiltransformations.targetSdk
 plugins {
     id("com.android.library")
     id("kotlin-android")
-    id("org.jlleitschuh.gradle.ktlint")
 }
 
 apply(from = "../publish.gradle")
 
 android {
+    namespace = "com.commit451.coiltransformations.facedetection"
     compileSdk = project.targetSdk
     defaultConfig {
         minSdk = project.minSdk

diff --git a/transformations-face-detection/src/main/AndroidManifest.xml b/transformations-face-detection/src/main/AndroidManifest.xml
@@ -1,5 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.commit451.coiltransformations.facedetection">
-
-</manifest>
+<manifest package="com.commit451.coiltransformations.facedetection"/>
diff --git a/transformations-gpu/build.gradle.kts b/transformations-gpu/build.gradle.kts
@@ -5,12 +5,12 @@ import coiltransformations.targetSdk
 plugins {
     id("com.android.library")
     id("kotlin-android")
-    id("org.jlleitschuh.gradle.ktlint")
 }
 
 apply(from = "../publish.gradle")
 
 android {
+    namespace = "com.commit451.coiltransformations.gpu"
     compileSdk = project.targetSdk
     defaultConfig {
         minSdk = project.minSdk

diff --git a/transformations/build.gradle.kts b/transformations/build.gradle.kts
@@ -5,12 +5,12 @@ import coiltransformations.targetSdk
 plugins {
     id("com.android.library")
     id("kotlin-android")
-    id("org.jlleitschuh.gradle.ktlint")
 }
 
 apply(from = "../publish.gradle")
 
 android {
+    namespace = "com.commit451.coiltransformations"
     compileSdk = project.targetSdk
     defaultConfig {
         minSdk = project.minSdk