diff --git a/.github/workflows/pre-merge.yaml b/.github/workflows/pre-merge.yaml index 601fba7c..3e90a52f 100644 --- a/.github/workflows/pre-merge.yaml +++ b/.github/workflows/pre-merge.yaml @@ -45,7 +45,7 @@ jobs: if: always() - name: Build the Debug variant - run: ./gradlew assembleDebug --no-daemon + run: ./gradlew assembleDebug - name: Build the Release variant - run: ./gradlew assembleRelease --no-daemon + run: ./gradlew assembleRelease diff --git a/Makefile b/Makefile index b44941ed..7c637dc0 100644 --- a/Makefile +++ b/Makefile @@ -1,17 +1,9 @@ -.PHONY: format clean preMerge stop all +.PHONY: format preMerge all format: ./gradlew spotlessApply -clean: - ./gradlew clean - preMerge: ./gradlew preMerge --continue -# We stop gradle at the end to make sure the cache folders -# don't contain any lock files and are free to be cached. -stop: - ./gradlew --stop - -all: stop clean format preMerge +all: format preMerge diff --git a/plugin-build/Makefile b/plugin-build/Makefile index 8976d5b6..8cc671a3 100644 --- a/plugin-build/Makefile +++ b/plugin-build/Makefile @@ -1,13 +1,10 @@ -.PHONY: clean compile all dist - -clean: - ./gradlew clean +.PHONY: compile all dist compile: ./gradlew assemble # build distribution artifacts dist: - ./gradlew distZip --no-daemon --no-parallel + ./gradlew distZip --no-parallel -all: clean compile dist +all: compile dist diff --git a/sentry-kotlin-compiler-plugin/Makefile b/sentry-kotlin-compiler-plugin/Makefile index 8976d5b6..8cc671a3 100644 --- a/sentry-kotlin-compiler-plugin/Makefile +++ b/sentry-kotlin-compiler-plugin/Makefile @@ -1,13 +1,10 @@ -.PHONY: clean compile all dist - -clean: - ./gradlew clean +.PHONY: compile all dist compile: ./gradlew assemble # build distribution artifacts dist: - ./gradlew distZip --no-daemon --no-parallel + ./gradlew distZip --no-parallel -all: clean compile dist +all: compile dist