Merge branch 'master' into #848-update-dependencies

Flank · Sep 18, 2020 · 025ba97 · 025ba97
2 parents 6964636 + fd3a36c
commit 025ba97
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 21 deletions.
diff --git a/.github/workflows/update_dependencies.yml b/.github/workflows/update_dependencies.yml
@@ -40,5 +40,5 @@ jobs:
           labels: |
             automated pr
             release
-          reviewers: bootstraponline,jan-gogo,pawelpasterz,adamfilipow92,piotradamczyk5,Sloox,axelzuziak-gogo
+          reviewers: 
           draft: false 
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -84,7 +84,6 @@ object Versions {
     // https://github.com/ben-manes/gradle-versions-plugin/releases
     const val BEN_MANES = "0.28.0"
 
-    // https://github.com/Guardsquare/proguard
     const val PROGUARD = "7.0.0"
 
     // ============== flank-scripts ==============

diff --git a/test_runner/build.gradle.kts b/test_runner/build.gradle.kts
@@ -42,7 +42,6 @@ shadowJar.apply {
         exclude(dependency(Dependencies.TRUTH))
         exclude(dependency(Dependencies.MOCKK))
         exclude(dependency(Dependencies.JUNIT))
-
         exclude(dependency(Dependencies.PROGUARD))
         exclude(dependency(Dependencies.DETEKT_FORMATTING))
     }
@@ -239,7 +238,6 @@ dependencies {
 
     implementation(Dependencies.JSOUP)
     implementation(Dependencies.OKHTTP)
-
     detektPlugins(Dependencies.DETEKT_FORMATTING)
 
     testImplementation(Dependencies.JUNIT)
@@ -248,7 +246,6 @@ dependencies {
     testImplementation(Dependencies.MOCKK)
 
     implementation(Dependencies.COMMON_TEXT)
-
     implementation(Dependencies.JANSI)
 }
 
@@ -284,23 +281,7 @@ val flankFullRun by tasks.registering(Exec::class) {
     group = "Build"
     description = "Perform full test_runner run"
     commandLine = listOf("./bash/update_flank.sh")
-}
 
-tasks.create("applyProguard", proguard.gradle.ProGuardTask::class.java) {
-    dependsOn("updateFlank")
-    description = "Apply proguard to flank and create a minimized jar"
-    dontwarn()
-    injars("./build/libs/flank.jar")
-    outjars("./build/libs/flank-proguard.jar")
-    libraryjars("${System.getProperty("java.home")}/lib/rt.jar")
-    libraryjars("./build/libs/flank-sources.jar")
-    configuration("./proguard/config.pro")
-    doLast {
-        copy {
-            from(file("$buildDir/libs/flank-proguard.jar"))
-            into(file("./bash/"))
-        }
-    }
 }
 
 // begin --- ASCII doc generation ---