Merge branch 'master' into jar-contributing-md

.github/workflows/ci.yml

@@ -24,6 +24,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+      - uses: extractions/setup-just@v2
       - uses: actions/checkout@master
 
       - name: Setup Java
@@ -37,7 +38,7 @@ jobs:
         run: echo "JAVA_TEST_HOME=${{ steps.setup-jre.outputs.path }}" >> $GITHUB_ENV
 
       - name: Spotless
-        run: ./gradlew spotlessCheck
+        run: just format-check
 
       - name: Build artifacts
         run: ./gradlew assemble javadoc
@@ -59,6 +60,7 @@ jobs:
           - "20"
 
     steps:
+      - uses: extractions/setup-just@v2
       - uses: actions/checkout@master
 
       - name: Setup Test Java Runtime
@@ -88,20 +90,13 @@ jobs:
 
       - uses: stripe/openapi/actions/stripe-mock@master
       - name: Run test suite
-        run: make ci-test
-
-      - name: Send code coverage report to coveralls.io
-        run: ./gradlew jacocoTestReport coveralls
-        if: env.COVERALLS_REPO_TOKEN && matrix.java-version == '17'
-        env:
-          CI_NAME: github-actions
-          COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
+        run: just test
 
   publish:
     if: >-
-        ((github.event_name == 'workflow_dispatch') || (github.event_name == 'push')) &&
-        startsWith(github.ref, 'refs/tags/v') &&
-        endsWith(github.actor, '-stripe')
+      ((github.event_name == 'workflow_dispatch') || (github.event_name == 'push')) &&
+      startsWith(github.ref, 'refs/tags/v') &&
+      endsWith(github.actor, '-stripe')
     needs: [build, test]
     runs-on: ubuntu-latest
     steps:

Makefile

@@ -1,3 +1,5 @@
+# NOTE: this file is deprecated and slated for deletion; prefer using the equivalent `just` commands.
+
 .PHONY: update-version codegen-format
 update-version:
 	@echo "$(VERSION)" > VERSION

README.md

@@ -3,7 +3,6 @@
 [![Maven Central](https://img.shields.io/badge/maven--central-v28.2.0-blue)](https://mvnrepository.com/artifact/com.stripe/stripe-java)
 [![JavaDoc](http://img.shields.io/badge/javadoc-reference-blue.svg)](https://stripe.dev/stripe-java)
 [![Build Status](https://github.com/stripe/stripe-java/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/stripe/stripe-java/actions?query=branch%3Amaster)
-[![Coverage Status](https://coveralls.io/repos/github/stripe/stripe-java/badge.svg?branch=master)](https://coveralls.io/github/stripe/stripe-java?branch=master)
 
 The official [Stripe][stripe] Java client library.
 
@@ -310,6 +309,8 @@ go get -u github.com/stripe/stripe-mock
 stripe-mock
 ```
 
+We use [just](https://github.com/casey/just) for conveniently running development tasks. You can use them directly, or copy the commands out of the `justfile`. To our help docs, run `just`.
+
 To run all checks (tests and code formatting):
 
 ```sh
@@ -319,16 +320,20 @@ To run all checks (tests and code formatting):
 To run the tests:
 
 ```sh
-./gradlew test
+just test
+# or: ./gradlew test
 ```
 
 You can run particular tests by passing `--tests Class#method`. Make sure you
 use the fully qualified class name. For example:
 
 ```sh
-./gradlew test --tests com.stripe.model.AccountTest
-./gradlew test --tests com.stripe.functional.CustomerTest
-./gradlew test --tests com.stripe.functional.CustomerTest.testCustomerCreate
+just test-one com.stripe.model.AccountTest
+just test-one com.stripe.functional.CustomerTest
+just test-one com.stripe.functional.CustomerTest.testCustomerCreate
+# or: ./gradlew test --tests com.stripe.model.AccountTest
+# or: ./gradlew test --tests com.stripe.functional.CustomerTest
+# or: ./gradlew test --tests com.stripe.functional.CustomerTest.testCustomerCreate
 ```
 
 The library uses [Spotless][spotless] along with
@@ -337,7 +342,8 @@ formatted before PRs are submitted, otherwise CI will fail. Run the formatter
 with:
 
 ```sh
-./gradlew spotlessApply
+just format
+# or: ./gradlew spotlessApply
 ```
 
 The library uses [Project Lombok][lombok]. While it is not a requirement, you

build.gradle

@@ -15,7 +15,6 @@ plugins {
     id "io.freefair.lombok" version "6.3.0"
     id "com.diffplug.spotless" version "6.4.0"
     id "net.ltgt.errorprone" version "2.0.2"
-    id "com.github.kt3k.coveralls" version "2.12.0"
     id "biz.aQute.bnd.builder" version "6.1.0"
     id "org.ajoberstar.git-publish" version "3.0.1"
 }
@@ -137,17 +136,6 @@ spotless {
     }
 }
 
-jacocoTestReport {
-    reports {
-        xml.required = true // coveralls plugin depends on xml format report
-        html.required = true
-    }
-}
-
-coveralls {
-    jacocoReportPath "build/reports/jacoco/test/jacocoTestReport.xml"
-}
-
 gitPublish {
     repoUri = 'https://github.com/stripe/stripe-java.git'
     branch = 'gh-pages'

justfile

@@ -0,0 +1,35 @@
+set quiet
+
+import? '../sdk-codegen/justfile'
+
+_default:
+    just --list --unsorted
+
+# ⭐ run the whole test suite
+[no-exit-message]
+test *args:
+    ./gradlew test {{ args }}
+
+# run a single test
+test-one modelPath: (test "--tests" modelPath)
+
+# ⭐ format all files
+[no-exit-message]
+format:
+    ./gradlew spotlessApply
+
+# check, but don't change, the formatting
+[no-exit-message]
+format-check:
+    ./gradlew spotlessCheck
+
+# called by tooling
+[private]
+update-version version:
+    echo "{{ version }}" > VERSION
+    perl -pi -e 's|badge/maven--central-v[.\d\-\w]+-blue|badge/maven--central-v{{ version }}-blue|' README.md
+    perl -pi -e 's|https:\/\/search\.maven\.org\/remotecontent\?filepath=com\/stripe\/stripe-java\/[.\d\-\w]+\/stripe-java-[.\d\-\w]+.jar|https://search.maven.org/remotecontent?filepath=com/stripe/stripe-java/{{ version }}/stripe-java-{{ version }}.jar|' README.md
+    perl -pi -e 's|implementation "com\.stripe:stripe-java:[.\d\-\w]+"|implementation "com.stripe:stripe-java:{{ version }}"|' README.md
+    perl -pi -e 's|<version>[.\d\-\w]+<\/version>|<version>{{ version }}</version>|' README.md
+    perl -pi -e 's|VERSION_NAME=[.\d\-\w]+|VERSION_NAME={{ version }}|' gradle.properties
+    perl -pi -e 's|public static final String VERSION = "[.\d\-\w]+";|public static final String VERSION = "{{ version }}";|' src/main/java/com/stripe/Stripe.java