From 7982592c6ed1a25b50f485d97c44ecac2dab24df Mon Sep 17 00:00:00 2001 From: Skylot Date: Thu, 4 Feb 2021 12:14:39 +0000 Subject: [PATCH] build: remove Travis and Bintray, disable codecov and sonarqube (#1113) --- .codecov.yml | 14 ------ .github/ISSUE_TEMPLATE/decompilation-error.md | 1 - .releaserc.yml | 37 --------------- .travis.yml | 46 ------------------- CONTRIBUTING.md | 1 - README.md | 8 +--- build.gradle | 20 -------- jadx-cli/build.gradle | 2 +- jadx-gui/build.gradle | 8 +--- scripts/bintray-upload.sh | 14 ------ scripts/travis-checks.sh | 9 ---- scripts/travis-master.sh | 6 --- scripts/travis-release.sh | 6 --- 13 files changed, 4 insertions(+), 168 deletions(-) delete mode 100644 .codecov.yml delete mode 100644 .releaserc.yml delete mode 100644 .travis.yml delete mode 100644 scripts/bintray-upload.sh delete mode 100644 scripts/travis-checks.sh delete mode 100644 scripts/travis-master.sh delete mode 100644 scripts/travis-release.sh diff --git a/.codecov.yml b/.codecov.yml deleted file mode 100644 index 9ad55f47edc..00000000000 --- a/.codecov.yml +++ /dev/null @@ -1,14 +0,0 @@ -coverage: - precision: 2 - round: down - range: "50...100" - - status: - project: - default: on - patch: - default: on - changes: - default: off - -comment: false diff --git a/.github/ISSUE_TEMPLATE/decompilation-error.md b/.github/ISSUE_TEMPLATE/decompilation-error.md index 27516b57cb1..ad5b3a39514 100644 --- a/.github/ISSUE_TEMPLATE/decompilation-error.md +++ b/.github/ISSUE_TEMPLATE/decompilation-error.md @@ -8,7 +8,6 @@ assignees: '' --- **Checks before report** -- check [latest unstable build](https://bintray.com/skylot/jadx/unstable/_latestVersion#files) (maybe issue already fixed) - check [Troubleshooting Q&A](https://github.com/skylot/jadx/wiki/Troubleshooting-Q&A) section on wiki - search existing issues by exception message diff --git a/.releaserc.yml b/.releaserc.yml deleted file mode 100644 index b6e44c487da..00000000000 --- a/.releaserc.yml +++ /dev/null @@ -1,37 +0,0 @@ -branches: - - release - -verifyConditions: - - '@semantic-release/github' - -prepare: - - path: '@semantic-release/exec' - cmd: "JADX_VERSION=${nextRelease.version} ./gradlew clean dist" - -preset: "angular" - -generateNotes: - - path: '@semantic-release/release-notes-generator' - writerOpts: - groupBy: "type" - commitGroupsSort: - - "feat" - - "perf" - - "fix" - commitsSort: "header" - -publish: - - path: '@semantic-release/exec' - cmd: "JADX_VERSION=${nextRelease.version} BINTRAY_PACKAGE=releases bash scripts/bintray-upload.sh" - - path: '@semantic-release/github' - assets: - - path: 'build/*.zip' - - path: 'build/*.exe' - -success: - - path: '@semantic-release/github' - successComment: false - -fail: - - path: '@semantic-release/github' - failComment: false diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index d4aed94e29a..00000000000 --- a/.travis.yml +++ /dev/null @@ -1,46 +0,0 @@ -language: java -os: linux -dist: trusty - -# don't build on tag push -if: tag IS blank - -git: - depth: false - -before_install: - - chmod +x gradlew - -# override install to skip 'gradle assemble' -install: true - -env: - global: - - TERM=dumb - - JADX_LAST_TAG=$(git describe --abbrev=0 --tags) - - JADX_VERSION="${JADX_LAST_TAG:1}-b$TRAVIS_BUILD_NUMBER-$(git rev-parse --short HEAD)" - -jdk: - - openjdk8 - - openjdk11 - -script: ./gradlew clean build - -jobs: - include: - - stage: checks - jdk: openjdk11 - if: branch = master AND repo = env(MAIN_REPO) AND type = push - script: bash scripts/travis-checks.sh - - - stage: deploy-unstable - jdk: openjdk8 - if: branch = master AND repo = env(MAIN_REPO) AND type = push - script: bash scripts/travis-master.sh - - - stage: deploy-release - language: node_js - jdk: openjdk8 - node_js: 11 - if: branch = release AND repo = env(MAIN_REPO) AND type = push - script: bash scripts/travis-release.sh diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a08fbd08a70..deca50edf05 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -5,7 +5,6 @@ Please note we have a [code of conduct](CODE_OF_CONDUCT.md), please follow it in ## Open Issue 1. Before proceed please do: - - check [latest unstable build](https://bintray.com/skylot/jadx/unstable/_latestVersion#files) (maybe issue already fixed) - check [Troubleshooting Q&A](https://github.com/skylot/jadx/wiki/Troubleshooting-Q&A) section on wiki - search existing issues by exception message diff --git a/README.md b/README.md index ef57e3fc832..0c3a5668e6e 100644 --- a/README.md +++ b/README.md @@ -2,12 +2,10 @@ ## JADX -[![Build Status](https://travis-ci.com/skylot/jadx.svg?branch=master)](https://travis-ci.com/skylot/jadx) -[![Code Coverage](https://codecov.io/gh/skylot/jadx/branch/master/graph/badge.svg)](https://codecov.io/gh/skylot/jadx) +[![Build status](https://github.com/skylot/jadx/workflows/Test%20build/badge.svg)](https://github.com/skylot/jadx/actions?query=workflow%3A%22Test+build%22) [![Alerts from lgtm.com](https://img.shields.io/lgtm/alerts/g/skylot/jadx.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/skylot/jadx/alerts/) -[![SonarQube Bugs](https://sonarcloud.io/api/project_badges/measure?project=jadx&metric=bugs)](https://sonarcloud.io/dashboard?id=jadx) -[![License](http://img.shields.io/:license-apache-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html) [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release) +[![License](http://img.shields.io/:license-apache-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html) **jadx** - Dex to Java decompiler @@ -31,9 +29,7 @@ See these features in action here: [jadx-gui features overview](https://github.c ### Download -- latest [unstable build: ![Download](https://api.bintray.com/packages/skylot/jadx/unstable/images/download.svg) ](https://bintray.com/skylot/jadx/unstable/_latestVersion#files) - release from [github: ![Latest release](https://img.shields.io/github/release/skylot/jadx.svg)](https://github.com/skylot/jadx/releases/latest) -- release from [bintray: ![Download](https://api.bintray.com/packages/skylot/jadx/releases/images/download.svg) ](https://bintray.com/skylot/jadx/releases/_latestVersion#files) After download unpack zip file go to `bin` directory and run: - `jadx` - command line version diff --git a/build.gradle b/build.gradle index 3a25c8645da..b0763265095 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,4 @@ plugins { - id 'org.sonarqube' version '3.1' id 'com.github.ben-manes.versions' version '0.36.0' id "com.diffplug.spotless" version "5.9.0" } @@ -10,7 +9,6 @@ println("jadx version: ${jadxVersion}") allprojects { apply plugin: 'java' - apply plugin: 'jacoco' apply plugin: 'checkstyle' version = jadxVersion @@ -57,33 +55,15 @@ allprojects { repositories { mavenLocal() mavenCentral() - jcenter() google() } - jacoco { - toolVersion = "0.8.6" - } - jacocoTestReport { - reports { - xml.enabled = true - html.enabled = true - } - } - checkstyleMain { // exclude all sources in samples module exclude '**/samples/**' } } -sonarqube { - properties { - property 'sonar.exclusions', '**/jadx/samples/**/*,**/test-app/**/*' - property 'sonar.coverage.exclusions', '**/jadx/gui/**/*' - } -} - spotless { java { target fileTree(rootDir).matching { diff --git a/jadx-cli/build.gradle b/jadx-cli/build.gradle index 291f6dcd38b..e0e77ee5095 100644 --- a/jadx-cli/build.gradle +++ b/jadx-cli/build.gradle @@ -9,7 +9,7 @@ dependencies { runtimeOnly(project(':jadx-plugins:jadx-smali-input')) runtimeOnly(project(':jadx-plugins:jadx-java-convert')) - implementation 'com.beust:jcommander:1.80' + implementation 'com.beust:jcommander:1.78' implementation 'ch.qos.logback:logback-classic:1.2.3' } diff --git a/jadx-gui/build.gradle b/jadx-gui/build.gradle index 2505cce48c2..0a8ac6e3021 100644 --- a/jadx-gui/build.gradle +++ b/jadx-gui/build.gradle @@ -8,7 +8,7 @@ dependencies { implementation(project(':jadx-core')) implementation(project(":jadx-cli")) - implementation 'com.beust:jcommander:1.80' + implementation 'com.beust:jcommander:1.78' implementation 'ch.qos.logback:logback-classic:1.2.3' implementation 'com.fifesoft:rsyntaxtextarea:3.1.2' @@ -81,9 +81,3 @@ launch4j { downloadUrl = 'https://adoptopenjdk.net/releases.html?variant=openjdk11&jvmVariant=hotspot#x64_win' bundledJrePath = '%JAVA_HOME%' } - -test { - jacoco { - enabled = false - } -} diff --git a/scripts/bintray-upload.sh b/scripts/bintray-upload.sh deleted file mode 100644 index a8982f981d5..00000000000 --- a/scripts/bintray-upload.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash -set -e - -export JFROG_CLI_OFFER_CONFIG=false -export JFROG_CLI_LOG_LEVEL=DEBUG - -npm install -g jfrog-cli-go - -TARGET=${BINTRAY_USER}/jadx/${BINTRAY_PACKAGE}/v${JADX_VERSION} -CREDENTIALS="--user=${BINTRAY_USER} --key=${BINTRAY_KEY}" - -jfrog bt version-create ${TARGET} ${CREDENTIALS} --desc=${JADX_VERSION} -jfrog bt upload 'build/jadx.*\.(zip|exe)' ${TARGET} ${CREDENTIALS} --regexp=true --publish=true -jfrog bt version-publish ${TARGET} ${CREDENTIALS} diff --git a/scripts/travis-checks.sh b/scripts/travis-checks.sh deleted file mode 100644 index 895a6c17d0e..00000000000 --- a/scripts/travis-checks.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash -set -e - -# upload coverage to codecov -./gradlew clean build jacocoTestReport -bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports" - -# run sonar checks -./gradlew clean sonarqube -Dsonar.host.url=${SONAR_HOST} -Dsonar.projectKey=jadx -Dsonar.organization=${SONAR_ORG} -Dsonar.login=${SONAR_TOKEN} || echo "Skip sonar build and upload" diff --git a/scripts/travis-master.sh b/scripts/travis-master.sh deleted file mode 100644 index f598cbce7ed..00000000000 --- a/scripts/travis-master.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -set -e - -# upload bundles to bintray unstable package -./gradlew clean dist -BINTRAY_PACKAGE=unstable bash scripts/bintray-upload.sh diff --git a/scripts/travis-release.sh b/scripts/travis-release.sh deleted file mode 100644 index 49c7ba64f00..00000000000 --- a/scripts/travis-release.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -set -e - -npm install -g semantic-release -npm install -g semantic-release/exec -semantic-release