Dependency versions bump (#49)

* Dependency versions bump * Add shipkit changelog * Add shipkit Github release * Add gradle publish plugin Co-authored-by: boguszpawlowski <bogusz.pawlowski@gmail.com>
DroidsOnRoids · Aug 31, 2021 · 6fec228 · 6fec228
1 parent b4852f0
commit 6fec228
Show file tree

Hide file tree

Showing 25 changed files with 509 additions and 451 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     ansi (1.5.0)
     ast (2.4.2)
@@ -13,7 +13,7 @@ GEM
     colored2 (3.1.2)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (8.2.2)
+    danger (8.3.1)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
@@ -25,31 +25,45 @@ GEM
       kramdown-parser-gfm (~> 1.0)
       no_proxy_fix
       octokit (~> 4.7)
-      terminal-table (~> 1)
-    danger-android_lint (0.0.8)
+      terminal-table (>= 1, < 4)
+    danger-android_lint (0.0.9)
       danger-plugin-api (~> 1.0)
       oga
     danger-kotlin_detekt (0.0.3)
       danger-plugin-api (~> 1.0)
     danger-plugin-api (1.0.0)
       danger (> 2.0)
-    faraday (1.3.0)
+    faraday (1.7.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
       faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
       multipart-post (>= 1.2, < 3)
-      ruby2_keywords
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
     faraday-http-cache (2.2.0)
       faraday (>= 0.8)
+    faraday-httpclient (1.0.1)
     faraday-net_http (1.0.1)
-    git (1.8.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    git (1.9.1)
       rchardet (~> 1.8)
-    kramdown (2.3.0)
+    kramdown (2.3.1)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     multipart-post (2.1.1)
     nap (1.1.0)
     no_proxy_fix (0.1.2)
-    octokit (4.20.0)
+    octokit (4.21.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     oga (3.3)
@@ -58,17 +72,17 @@ GEM
     open4 (1.3.4)
     public_suffix (4.0.6)
     rchardet (1.8.0)
-    rexml (3.2.4)
+    rexml (3.2.5)
     ruby-ll (2.1.2)
       ansi
       ast
-    ruby2_keywords (0.0.4)
+    ruby2_keywords (0.0.5)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    unicode-display_width (1.7.0)
+    terminal-table (3.0.1)
+      unicode-display_width (>= 1.1.1, < 3)
+    unicode-display_width (2.0.0)
 
 PLATFORMS
   ruby
@@ -78,4 +92,4 @@ DEPENDENCIES
   danger-kotlin_detekt
 
 BUNDLED WITH
-   2.2.9
+   2.2.16
diff --git a/README.md b/README.md
@@ -42,7 +42,8 @@ repositories {
 - Hyperion menu item with font scale changer [Hyperion Font Scale](#font-scale-plugin)
 - Hyperion menu item with [Chucker](https://github.com/ChuckerTeam/chucker) launcher [Hyperion FoQA Chucker](#chucker-plugin)
 
-See [build.gradle](foqa/build.gradle) for a complete list of components. And [build.gradle](build.gradle.kts) for versions.
+See [build.gradle.kts](foqa/build.gradle.kts) for a complete list of components.
+And [Dependencies.kt](src/main/kotlin/Dependencies.kt) for versions.
 
 ## FoQA Hyperion plugins
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,6 +1,8 @@
 import com.android.build.gradle.LibraryExtension
 import io.gitlab.arturbosch.detekt.Detekt
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.shipkit.changelog.GenerateChangelogTask
+import org.shipkit.github.release.GithubReleaseTask
 
 buildscript {
     repositories {
@@ -12,13 +14,16 @@ buildscript {
     dependencies {
         classpath(Dependencies.androidGradlePlugin)
         classpath(Dependencies.kotlinGradlePlugin)
+        classpath(Dependencies.publishGradlePlugin)
     }
 }
 
 plugins {
-    id("io.gitlab.arturbosch.detekt") version "1.16.0-RC1"
-    id("org.shipkit.java") version "2.3.5"
-    id("com.github.ben-manes.versions") version "0.36.0"
+    id("io.gitlab.arturbosch.detekt") version "1.18.0-RC3"
+    id("com.github.ben-manes.versions") version "0.39.0"
+    id("org.shipkit.shipkit-changelog") version "1.1.15"
+    id("org.shipkit.shipkit-github-release") version "1.1.15"
+    id("org.shipkit.shipkit-auto-version") version "1.1.19"
 }
 
 repositories {
@@ -32,24 +37,36 @@ dependencies {
 }
 
 detekt {
-    input = files(projectDir)
+    source = files(projectDir)
     config = rootProject.files("detekt-config.yml")
 }
 
-tasks.withType(Detekt::class) {
-    exclude("build/")
-    exclude("buildSrc/build/")
-    parallel = true
-    reports {
-        xml.enabled = true
-        html.enabled = false
-        txt.enabled = false
+tasks {
+    withType(GenerateChangelogTask::class) {
+        previousRevision = project.ext["shipkit-auto-version.previous-tag"] as String
+        githubToken = System.getenv("GH_READ_TOKEN")
+        repository = "DroidsOnRoids/FoQA"
     }
-}
-
-tasks.withType(KotlinCompile::class).all {
-    kotlinOptions {
-        freeCompilerArgs = listOf("-Xexplicit-api=strict")
+    withType(GithubReleaseTask::class) {
+        repository = "DroidsOnRoids/FoQA"
+        changelog = File(buildDir, "changelog.md")
+        githubToken = System.getenv("GH_WRITE_TOKEN")
+        newTagRevision = System.getenv("BITRISE_GIT_COMMIT")
+    }
+    withType(Detekt::class) {
+        exclude("build/")
+        exclude("buildSrc/build/")
+        parallel = true
+        reports {
+            xml.enabled = true
+            html.enabled = false
+            txt.enabled = false
+        }
+    }
+    withType(KotlinCompile::class).all {
+        kotlinOptions {
+            freeCompilerArgs = listOf("-Xexplicit-api=strict")
+        }
     }
 }
 
@@ -69,14 +86,13 @@ subprojects {
     apply(plugin = "com.android.library")
     apply(plugin = "kotlin-android")
     apply(plugin = "kotlin-kapt")
-    apply(plugin = "org.shipkit.bintray")
-    apply(plugin = "org.shipkit.android-publish")
+    apply(plugin = "com.vanniktech.maven.publish")
 
     with(extensions.getByName("android") as LibraryExtension) {
-        compileSdkVersion(Dependencies.compileSdk)
+        compileSdk = Dependencies.compileSdk
         defaultConfig {
-            setMinSdkVersion(Dependencies.minSdk)
-            setTargetSdkVersion(Dependencies.targetSdk)
+            minSdk = Dependencies.minSdk
+            targetSdk = Dependencies.targetSdk
         }
 
         resourcePrefix = "foqa_"