diff --git a/.github/workflows/maintenance.yml b/.github/workflows/maintenance.yml index e7935fdb..bb0b5851 100644 --- a/.github/workflows/maintenance.yml +++ b/.github/workflows/maintenance.yml @@ -7,7 +7,7 @@ on: jobs: build: - name: Test and Build + name: Maintenance Time runs-on: ubuntu-latest steps: @@ -22,7 +22,7 @@ jobs: uses: actions/checkout@v2.3.1 # Run Maintenance Tasks - - name: Android App + - name: Maintenance Run run: ./gradlew :maintenance-tasks:run env: GH_TOKEN: ${{ secrets.GH_TOKEN }} diff --git a/buildSrc/src/main/kotlin/android-setup.gradle.kts b/buildSrc/src/main/kotlin/android-setup.gradle.kts index e932119b..f33828a0 100644 --- a/buildSrc/src/main/kotlin/android-setup.gradle.kts +++ b/buildSrc/src/main/kotlin/android-setup.gradle.kts @@ -27,11 +27,6 @@ android { targetSdkVersion(Versions.targetSdkVersion) } - /*composeOptions { - kotlinCompilerExtensionVersion = Versions.compose - kotlinCompilerVersion = Versions.kotlinVersion - }*/ - compileOptions { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 diff --git a/maintenance-tasks/build.gradle.kts b/maintenance-tasks/build.gradle.kts index ec88f910..8b1d055c 100644 --- a/maintenance-tasks/build.gradle.kts +++ b/maintenance-tasks/build.gradle.kts @@ -1,6 +1,7 @@ plugins { kotlin("jvm") kotlin("plugin.serialization") + id("ktlint-setup") application } diff --git a/maintenance-tasks/src/main/kotlin/analytics_html_img/Common.kt b/maintenance-tasks/src/main/kotlin/analytics_html_img/Common.kt index 68bb66b2..ff87a0b0 100644 --- a/maintenance-tasks/src/main/kotlin/analytics_html_img/Common.kt +++ b/maintenance-tasks/src/main/kotlin/analytics_html_img/Common.kt @@ -6,7 +6,7 @@ import utils.byProperty internal object Common { const val GITHUB_API = "https://api.github.com" - val GITHUB_TOKEN get() = "GITHUB_TOKEN".byProperty + val GH_TOKEN get() = "GH_TOKEN".byProperty fun START_SECTION(tagName: String = "HTI") = "" fun END_SECTION(tagName: String = "HTI") = "" const val USER_AGENT = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:88.0) Gecko/20100101 Firefox/88.0" diff --git a/maintenance-tasks/src/main/kotlin/analytics_html_img/UpdateAnalyticsImage.kt b/maintenance-tasks/src/main/kotlin/analytics_html_img/UpdateAnalyticsImage.kt index ecc3b05d..030dc907 100644 --- a/maintenance-tasks/src/main/kotlin/analytics_html_img/UpdateAnalyticsImage.kt +++ b/maintenance-tasks/src/main/kotlin/analytics_html_img/UpdateAnalyticsImage.kt @@ -9,7 +9,7 @@ internal fun updateAnalyticsImage() { runBlocking { val oldGithubFile = GithubService.getGithubFileContent( - token = Common.GITHUB_TOKEN, + token = Common.GH_TOKEN, ownerName = secrets.ownerName, repoName = secrets.repoName, branchName = secrets.branchName, @@ -43,7 +43,7 @@ internal fun updateAnalyticsImage() { // debug("Updated File Content:\n$updatedContent") val updationResponse = GithubService.updateGithubFileContent( - token = Common.GITHUB_TOKEN, + token = Common.GH_TOKEN, ownerName = secrets.ownerName, repoName = secrets.repoName, branchName = secrets.branchName,