PIA-1191: Update maven plugin and ktlint configuration (#5)

* PIA-1191: Update maven plugin configuration * PIA-1191: Apply ktlint format changes
pia-foss · Jan 11, 2024 · 76f9f29 · 76f9f29
1 parent 708bb5b
commit 76f9f29
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 22 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,6 +2,44 @@
 plugins {
     id("com.android.library") version "8.2.0" apply false
     id("org.jetbrains.kotlin.android") version "1.9.10" apply false
-    id("org.jlleitschuh.gradle.ktlint") version "11.5.1" apply false
+    id("org.jlleitschuh.gradle.ktlint") version "11.5.1" apply true
     id("org.mozilla.rust-android-gradle.rust-android") version "0.9.3" apply false
-}
+    id("maven-publish") apply true
+}
+
+allprojects {
+    group = "com.kape.android"
+    version = "0.0.1"
+    apply(plugin = "org.jlleitschuh.gradle.ktlint")
+    apply(plugin = "maven-publish")
+}
+
+subprojects {
+    project.afterEvaluate {
+        if (!plugins.hasPlugin("android")) {
+            publishing {
+                publications {
+                    create<MavenPublication>("Maven") {
+                        afterEvaluate {
+                            artifactId = project.name
+                            if (plugins.hasPlugin("java")) {
+                                from(components["java"])
+                            } else if (plugins.hasPlugin("android-library")) {
+                                from(components["release"])
+                            }
+                        }
+                        repositories {
+                            maven {
+                                url = uri("https://maven.pkg.github.com/pia-foss/mobile-android-obfuscation-proxy/")
+                                credentials {
+                                    username = System.getenv("GITHUB_USERNAME")
+                                    password = System.getenv("GITHUB_TOKEN")
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/obfuscator/build.gradle.kts b/obfuscator/build.gradle.kts
@@ -3,21 +3,7 @@ import org.gradle.kotlin.dsl.support.listFilesOrdered
 plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
-    id("org.jlleitschuh.gradle.ktlint")
     id("org.mozilla.rust-android-gradle.rust-android")
-    id("maven-publish")
-}
-
-publishing {
-    repositories {
-        maven {
-            url = uri("https://maven.pkg.github.com/pia-foss/mobile-android-obfuscation-proxy/")
-            credentials {
-                username = System.getenv("GITHUB_USERNAME")
-                password = System.getenv("GITHUB_TOKEN")
-            }
-        }
-    }
 }
 
 android {

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -16,4 +16,4 @@ dependencyResolutionManagement {
 }
 
 include(":testapp")
-include(":obfuscator")
+include(":obfuscator")
diff --git a/testapp/build.gradle.kts b/testapp/build.gradle.kts
@@ -47,4 +47,4 @@ dependencies {
     implementation("androidx.core:core-ktx:1.12.0")
     implementation("androidx.appcompat:appcompat:1.6.1")
     implementation("com.google.android.material:material:1.11.0")
-}
+}
diff --git a/testapp/src/main/java/com/kape/obfuscator/testapplication/MainActivity.kt b/testapp/src/main/java/com/kape/obfuscator/testapplication/MainActivity.kt
@@ -21,10 +21,10 @@ package com.kape.obfuscator.testapplication
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.kape.obfuscator.testapp.databinding.ActivityMainBinding
 import com.kape.obfuscator.presenter.ObfuscatorAPI
 import com.kape.obfuscator.presenter.ObfuscatorBuilder
 import com.kape.obfuscator.presenter.ObfuscatorProcessEventHandler
+import com.kape.obfuscator.testapp.databinding.ActivityMainBinding
 import kotlinx.coroutines.Dispatchers
 
 class MainActivity : AppCompatActivity(), ObfuscatorProcessEventHandler {
@@ -52,7 +52,7 @@ class MainActivity : AppCompatActivity(), ObfuscatorProcessEventHandler {
                     "-s", "154.47.20.240:443",
                     "-k", "shadowsocks",
                     "-b", "127.0.0.1:8383",
-                    "-m", "aes-128-gcm",
+                    "-m", "aes-128-gcm"
                 ),
                 obfuscatorProcessEventHandler = this
             ) {
@@ -77,4 +77,4 @@ class MainActivity : AppCompatActivity(), ObfuscatorProcessEventHandler {
         return Result.success(Unit)
     }
     // endregion
-}
+}
diff --git a/testapp/src/main/java/com/kape/obfuscator/testapplication/UILogger.kt b/testapp/src/main/java/com/kape/obfuscator/testapplication/UILogger.kt
@@ -30,4 +30,4 @@ class UILogger(private val textViewOutput: TextView) {
         val currentTime = SimpleDateFormat("HH:mm:ss", Locale.getDefault()).format(Date())
         textViewOutput.append("$currentTime - $line\n\n")
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,4 +30,4 @@ class UILogger(private val textViewOutput: TextView) { @@
             val currentTime = SimpleDateFormat("HH:mm:ss", Locale.getDefault()).format(Date())
             textViewOutput.append("$currentTime - $line\n\n")
         }
-    }
+    }