diff --git a/docs/flank-scripts/ops_structure.md b/docs/flank-scripts/ops_structure.md index 8de44f3201..e906874b0c 100644 --- a/docs/flank-scripts/ops_structure.md +++ b/docs/flank-scripts/ops_structure.md @@ -2,5 +2,4 @@ Flank-scripts `ops` packages mostly match `cli` structure, however, for widely used function there is a separate package called `common`. -For better code organization `updatebinaries` has a separate package inside `dependencies`, as well as `jfrog` in -`release` package. +For better code organization `updatebinaries` has a separate package inside `dependencies`. diff --git a/docs/flank_secrets.md b/docs/flank_secrets.md index e978a13882..7190b86658 100644 --- a/docs/flank_secrets.md +++ b/docs/flank_secrets.md @@ -1,6 +1,6 @@ # Flank Secrets -Flank securely communicates to Firebase Test Lab using Google's official Java SDKs for authorization. +Flank securely communicates to Firebase Test Lab using Google's official Java SDKs for authorization. ## 2FA @@ -12,8 +12,4 @@ Flank runs require authorization with either a Google user account or a service ## Developing Flank -The Flank release job requires secrets as part of continuous delivery. A [flankbot](https://bintray.com/flankbot) account with [`Member`](https://www.jfrog.com/confluence/display/BT/Bintray+Organizations#:~:text=A%20member%20of%20an%20organization%20in%20Bintray%20can%20create%20repositories,details%2C%20and%20change%20member%20authorizations.) level permission is used to release artifacts on bintray. - -- `GITHUB_TOKEN` - Provided by [GitHub Actions](https://docs.github.com/en/actions/configuring-and-managing-workflows/authenticating-with-the-github_token) -- `JFROG_USER` - Username for jfrog authentication -- `JFROG_API_KEY` - API key for jfrog used to publish releases. The API key is found in https://bintray.com/profile/edit +The Flank release job requires secrets as part of continuous delivery. We use our Sonatype account for releasing a new version of Flank to the [Maven Central Repository](https://mvnrepository.com/artifact/com.github.flank/flank). diff --git a/docs/index.md b/docs/index.md index 333ced5a23..f13dcaf994 100644 --- a/docs/index.md +++ b/docs/index.md @@ -978,11 +978,11 @@ v3.0-SNAPSHOT ## Maven You can consume Flank via maven. -See the [maven repo](https://bintray.com/flank/maven/flank) for all supported versions. +See the [maven repo](https://mvnrepository.com/artifact/com.github.flank/flank) for all supported versions. ``` repositories { - maven(url = "https://dl.bintray.com/flank/maven") + mavenCentral() } dependencies { diff --git a/flank-scripts/src/test/kotlin/flank/scripts/ops/dependencies/testfiles/ExpectedTestVersionsAfterUpdateVersion b/flank-scripts/src/test/kotlin/flank/scripts/ops/dependencies/testfiles/ExpectedTestVersionsAfterUpdateVersion index 5d9269f2ad..b85b937af8 100644 --- a/flank-scripts/src/test/kotlin/flank/scripts/ops/dependencies/testfiles/ExpectedTestVersionsAfterUpdateVersion +++ b/flank-scripts/src/test/kotlin/flank/scripts/ops/dependencies/testfiles/ExpectedTestVersionsAfterUpdateVersion @@ -8,9 +8,6 @@ object Versions { // https://github.com/detekt/detekt const val DETEKT = "0.11.1" - // https://github.com/bintray/gradle-bintray-plugin/releases - const val BINTRAY = "1.8.5" - // https://github.com/johnrengelman/shadow/releases const val SHADOW = "6.0.0" diff --git a/flank-scripts/src/test/kotlin/flank/scripts/ops/dependencies/testfiles/ExpectedVersionAfterPluginDependencies b/flank-scripts/src/test/kotlin/flank/scripts/ops/dependencies/testfiles/ExpectedVersionAfterPluginDependencies index 62a1ab8706..765f07a38a 100644 --- a/flank-scripts/src/test/kotlin/flank/scripts/ops/dependencies/testfiles/ExpectedVersionAfterPluginDependencies +++ b/flank-scripts/src/test/kotlin/flank/scripts/ops/dependencies/testfiles/ExpectedVersionAfterPluginDependencies @@ -8,9 +8,6 @@ object Versions { // https://github.com/detekt/detekt const val DETEKT = "1.13.1" - // https://github.com/bintray/gradle-bintray-plugin/releases - const val BINTRAY = "1.8.5" - // https://github.com/johnrengelman/shadow/releases const val SHADOW = "6.0.0" diff --git a/flank-scripts/src/test/kotlin/flank/scripts/ops/dependencies/testfiles/ExpectedVersionAfterUpdateDependencies b/flank-scripts/src/test/kotlin/flank/scripts/ops/dependencies/testfiles/ExpectedVersionAfterUpdateDependencies index b1cab80b8f..1a8caadfaf 100644 --- a/flank-scripts/src/test/kotlin/flank/scripts/ops/dependencies/testfiles/ExpectedVersionAfterUpdateDependencies +++ b/flank-scripts/src/test/kotlin/flank/scripts/ops/dependencies/testfiles/ExpectedVersionAfterUpdateDependencies @@ -8,9 +8,6 @@ object Versions { // https://github.com/detekt/detekt const val DETEKT = "1.12.0" - // https://github.com/bintray/gradle-bintray-plugin/releases - const val BINTRAY = "1.8.5" - // https://github.com/johnrengelman/shadow/releases const val SHADOW = "6.0.0" diff --git a/flank-scripts/src/test/kotlin/flank/scripts/ops/dependencies/testfiles/TestPlugins b/flank-scripts/src/test/kotlin/flank/scripts/ops/dependencies/testfiles/TestPlugins index 2672811ac2..94ca4eef9d 100644 --- a/flank-scripts/src/test/kotlin/flank/scripts/ops/dependencies/testfiles/TestPlugins +++ b/flank-scripts/src/test/kotlin/flank/scripts/ops/dependencies/testfiles/TestPlugins @@ -1,8 +1,6 @@ object Plugins { - const val PLUGIN_SHADOW_JAR = "com.github.johnrengelman.shadow" const val DETEKT_PLUGIN = "io.gitlab.arturbosch.detekt" - const val JFROG_BINTRAY = "com.jfrog.bintray" const val MAVEN_PUBLISH = "maven-publish" const val BEN_MANES_PLUGIN = "com.github.ben-manes.versions" object Kotlin { diff --git a/flank-scripts/src/test/kotlin/flank/scripts/ops/dependencies/testfiles/TestVersions b/flank-scripts/src/test/kotlin/flank/scripts/ops/dependencies/testfiles/TestVersions index cb6c9e11ae..ce3aaef19a 100644 --- a/flank-scripts/src/test/kotlin/flank/scripts/ops/dependencies/testfiles/TestVersions +++ b/flank-scripts/src/test/kotlin/flank/scripts/ops/dependencies/testfiles/TestVersions @@ -8,9 +8,6 @@ object Versions { // https://github.com/detekt/detekt const val DETEKT = "1.11.0" - // https://github.com/bintray/gradle-bintray-plugin/releases - const val BINTRAY = "1.8.5" - // https://github.com/johnrengelman/shadow/releases const val SHADOW = "6.0.0" diff --git a/flank-scripts/src/test/kotlin/flank/scripts/ops/dependencies/testfiles/build.gradle.kts.test b/flank-scripts/src/test/kotlin/flank/scripts/ops/dependencies/testfiles/build.gradle.kts.test index 867df36c55..03410929f8 100644 --- a/flank-scripts/src/test/kotlin/flank/scripts/ops/dependencies/testfiles/build.gradle.kts.test +++ b/flank-scripts/src/test/kotlin/flank/scripts/ops/dependencies/testfiles/build.gradle.kts.test @@ -5,7 +5,6 @@ plugins { jacoco kotlin(Plugins.Kotlin.PLUGIN_JVM) id(Plugins.DETEKT_PLUGIN) version Versions.DETEKT - id(Plugins.JFROG_BINTRAY) version Versions.BINTRAY id(Plugins.MAVEN_PUBLISH) id(Plugins.PLUGIN_SHADOW_JAR) version Versions.SHADOW id(Plugins.BEN_MANES_PLUGIN) version Versions.BEN_MANES diff --git a/flank-scripts/src/test/kotlin/flank/scripts/ops/dependencies/testfiles/report.json b/flank-scripts/src/test/kotlin/flank/scripts/ops/dependencies/testfiles/report.json index b8902be211..d34b2fdfaf 100644 --- a/flank-scripts/src/test/kotlin/flank/scripts/ops/dependencies/testfiles/report.json +++ b/flank-scripts/src/test/kotlin/flank/scripts/ops/dependencies/testfiles/report.json @@ -43,12 +43,6 @@ "projectUrl": "http://www.github.com/3breadt/dd-plist", "name": "dd-plist" }, - { - "group": "com.jfrog.bintray", - "version": "1.8.5", - "projectUrl": null, - "name": "com.jfrog.bintray.gradle.plugin" - }, { "group": "com.linkedin.dextestparser", "version": "2.2.1", @@ -147,7 +141,7 @@ }, "exceeded": { "dependencies": [ - + ], "count": 0 }, @@ -356,7 +350,7 @@ }, "unresolved": { "dependencies": [ - + ], "count": 0 }, diff --git a/integration_tests/build.gradle.kts b/integration_tests/build.gradle.kts index 9d94c74901..e29ebd7efa 100644 --- a/integration_tests/build.gradle.kts +++ b/integration_tests/build.gradle.kts @@ -11,8 +11,6 @@ version = "1.0" repositories { mavenCentral() - maven(url = "https://dl.bintray.com/kotlin/ktor") - maven(url = "https://dl.bintray.com/kotlin/kotlinx") } dependencies {