Cleanup

Pluto-tv · Mar 19, 2024 · b83d37e · b83d37e
1 parent 501057c
commit b83d37e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 43 deletions.
diff --git a/.github/workflows/build-development.yaml b/.github/workflows/build-development.yaml
@@ -7,11 +7,6 @@ on:
     branches:
       - 'master'
 
-env:
-  REPO_ARTIFACTS_URL: ${{ secrets.REPO_ARTIFACTS_URL }}
-  REPO_USERID: ${{ secrets.REPO_USERID }}
-  REPO_PASSWORD: ${{ secrets.REPO_PASSWORD }}
-
 jobs:
   build:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/publish_release.yaml b/.github/workflows/publish_release.yaml
@@ -8,9 +8,6 @@ on:
     branches:
      - 'datastore-kotlin-impl'
 env:
-  REPO_ARTIFACTS_URL: ${{ secrets.REPO_ARTIFACTS_URL }}
-  REPO_USERID: ${{ secrets.REPO_USERID }}
-  REPO_PASSWORD: ${{ secrets.REPO_PASSWORD }}
   REPO_PUBLISH_URL: ${{ secrets.REPO_PUBLISH_URL }}
   REPO_PUBLISH_USERID: ${{ secrets.REPO_PUBLISH_USERID }}
   REPO_PUBLISH_PW: ${{ secrets.REPO_PUBLISH_PW }}

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -31,6 +31,5 @@ mockito-kotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", versio
 kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutinesTest" }
 
 [plugins]
-androidApplication = { id = "com.android.application", version.ref = "agp" }
 androidLib = { id = "com.android.library", version.ref = "agp" }
 jetbrainsKotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
diff --git a/persistent-cookie-jar-okhttp/build.gradle.kts b/persistent-cookie-jar-okhttp/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("com.android.library")
+    alias(libs.plugins.androidLib)
     alias(libs.plugins.jetbrainsKotlinAndroid)
     `maven-publish`
 }

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,43 +1,14 @@
 pluginManagement {
-
-    java.util.Properties().apply {
-        try {
-            File("gradle.properties").reader().use { load(it) }
-        } catch (error: Exception) {
-            //do Nothing
-        }
-    }.also {
-        print(it)
-
-        val repoArtifactsURL: String = System.getenv("REPO_ARTIFACTS_URL") ?: it.getProperty("REPO_ARTIFACTS_URL")
-        val repoUsername: String = System.getenv("REPO_USERID") ?: it.getProperty("REPO_USERID")
-        val repoPassword: String = System.getenv("REPO_PASSWORD") ?: it.getProperty("REPO_PASSWORD")
-
-        extra.set("repoArtifactsURL", repoArtifactsURL)
-        extra.set("repoUsername", repoUsername)
-        extra.set("repoPassword", repoPassword)
-    }
-
     repositories {
-        maven {
-            url = uri(extra.get("repoArtifactsURL") as String)
-            credentials {
-                username = extra.get("repoUsername") as String
-                password = extra.get("repoPassword") as String
-            }
-        }
+        google()
+        mavenCentral()
     }
 }
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
-        maven {
-            url = uri(extra.get("repoArtifactsURL") as String)
-            credentials {
-                username = extra.get("repoUsername") as String
-                password = extra.get("repoPassword") as String
-            }
-        }
+        google()
+        mavenCentral()
     }
 }