diff --git a/copy-sdks b/copy-sdks index a2366b1d5..c291f0ce3 100755 --- a/copy-sdks +++ b/copy-sdks @@ -102,8 +102,18 @@ function copy_files() git reset --hard origin/${REPO_MAIN_BRANCH} git pull origin ${REPO_MAIN_BRANCH} git checkout -b "release-${VERSION}" + git rm -rf --cached . - cp -r "${DIR}/sdks/${SDK}/." "${SDK_DIR}" + popd + + cp -r "${DIR}/sdks/${SDK}" "${SDK_DIR}-tmp" + cp -r "${SDK_DIR}/.git" "${SDK_DIR}-tmp/" + rm -rf "${SDK_DIR}" + mv "${SDK_DIR}-tmp" "${SDK_DIR}" + + pushd "${SDK_DIR}/" + + git add . rm -f "${SDK_DIR}/openapi-sdk.yaml" rm -rf "${SDK_DIR}/examples" diff --git a/examples/OauthTokenGenerate.py b/examples/OauthTokenGenerate.py index 2d77a4c16..c8fd0bdd0 100644 --- a/examples/OauthTokenGenerate.py +++ b/examples/OauthTokenGenerate.py @@ -6,7 +6,7 @@ configuration = Configuration() with ApiClient(configuration) as api_client: - api = apis.OAuthApi(api_client) + oauth_api = apis.OAuthApi(api_client) data = models.OAuthTokenGenerateRequest( state="900e06e2", diff --git a/examples/OauthTokenRefresh.py b/examples/OauthTokenRefresh.py index 9d11f4d83..832bbafa0 100644 --- a/examples/OauthTokenRefresh.py +++ b/examples/OauthTokenRefresh.py @@ -6,7 +6,7 @@ configuration = Configuration() with ApiClient(configuration) as api_client: - api = apis.OAuthApi(api_client) + oauth_api = apis.OAuthApi(api_client) data = models.OAuthTokenRefreshRequest( refresh_token="hNTI2MTFmM2VmZDQxZTZjOWRmZmFjZmVmMGMyNGFjMzI2MGI5YzgzNmE3", diff --git a/sdks/java-v1/.gitignore b/sdks/java-v1/.gitignore index e275017bf..6d0a68e9a 100644 --- a/sdks/java-v1/.gitignore +++ b/sdks/java-v1/.gitignore @@ -8,6 +8,8 @@ *.war *.ear +# exclude jar for gradle wrapper +!gradle/wrapper/*.jar # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* @@ -23,4 +25,3 @@ vendor .idea/ .openapi-generator .github/workflows/maven.yml -gradle diff --git a/sdks/java-v1/gradle/wrapper/gradle-wrapper.jar b/sdks/java-v1/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000..e6441136f Binary files /dev/null and b/sdks/java-v1/gradle/wrapper/gradle-wrapper.jar differ diff --git a/sdks/java-v1/gradle/wrapper/gradle-wrapper.properties b/sdks/java-v1/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..5c6f89dba --- /dev/null +++ b/sdks/java-v1/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/sdks/java-v1/templates/gitignore.mustache b/sdks/java-v1/templates/gitignore.mustache index 7973a3bc5..69e070361 100644 --- a/sdks/java-v1/templates/gitignore.mustache +++ b/sdks/java-v1/templates/gitignore.mustache @@ -8,10 +8,8 @@ *.war *.ear -{{^useCustomTemplateCode}} # exclude jar for gradle wrapper !gradle/wrapper/*.jar -{{/useCustomTemplateCode}} # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* @@ -28,5 +26,4 @@ vendor .idea/ .openapi-generator .github/workflows/maven.yml -gradle {{/useCustomTemplateCode}} diff --git a/sdks/java-v2/.gitignore b/sdks/java-v2/.gitignore index e275017bf..6d0a68e9a 100644 --- a/sdks/java-v2/.gitignore +++ b/sdks/java-v2/.gitignore @@ -8,6 +8,8 @@ *.war *.ear +# exclude jar for gradle wrapper +!gradle/wrapper/*.jar # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* @@ -23,4 +25,3 @@ vendor .idea/ .openapi-generator .github/workflows/maven.yml -gradle diff --git a/sdks/java-v2/gradle/wrapper/gradle-wrapper.jar b/sdks/java-v2/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000..e6441136f Binary files /dev/null and b/sdks/java-v2/gradle/wrapper/gradle-wrapper.jar differ diff --git a/sdks/java-v2/gradle/wrapper/gradle-wrapper.properties b/sdks/java-v2/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..5c6f89dba --- /dev/null +++ b/sdks/java-v2/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/sdks/java-v2/templates/gitignore.mustache b/sdks/java-v2/templates/gitignore.mustache index 7973a3bc5..69e070361 100644 --- a/sdks/java-v2/templates/gitignore.mustache +++ b/sdks/java-v2/templates/gitignore.mustache @@ -8,10 +8,8 @@ *.war *.ear -{{^useCustomTemplateCode}} # exclude jar for gradle wrapper !gradle/wrapper/*.jar -{{/useCustomTemplateCode}} # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* @@ -28,5 +26,4 @@ vendor .idea/ .openapi-generator .github/workflows/maven.yml -gradle {{/useCustomTemplateCode}} diff --git a/sdks/python/.github/workflows/python.yml b/sdks/python/.github/workflows/python.yml deleted file mode 100644 index d7d9ec328..000000000 --- a/sdks/python/.github/workflows/python.yml +++ /dev/null @@ -1,38 +0,0 @@ -# NOTE: This file is auto generated by OpenAPI Generator. -# URL: https://openapi-generator.tech -# -# ref: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python - -name: dropbox_sign Python package - -on: [push, pull_request] - -jobs: - build: - - runs-on: ubuntu-latest - strategy: - matrix: - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] - - steps: - - uses: actions/checkout@v3 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install flake8 pytest - if [ -f requirements.txt ]; then pip install -r requirements.txt; fi - if [ -f test-requirements.txt ]; then pip install -r test-requirements.txt; fi - - name: Lint with flake8 - run: | - # stop the build if there are Python syntax errors or undefined names - flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics - # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide - flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics - - name: Test with pytest - run: | - pytest diff --git a/sdks/python/.gitignore b/sdks/python/.gitignore index 25f66e000..b65ccd6fb 100644 --- a/sdks/python/.gitignore +++ b/sdks/python/.gitignore @@ -67,3 +67,4 @@ target/ .openapi-generator /vendor +/.github/workflows/python.yml diff --git a/sdks/python/docs/OAuthApi.md b/sdks/python/docs/OAuthApi.md index 9bb584d6c..2f0dcee0c 100644 --- a/sdks/python/docs/OAuthApi.md +++ b/sdks/python/docs/OAuthApi.md @@ -27,7 +27,7 @@ from dropbox_sign import \ configuration = Configuration() with ApiClient(configuration) as api_client: - api = apis.OAuthApi(api_client) + oauth_api = apis.OAuthApi(api_client) data = models.OAuthTokenGenerateRequest( state="900e06e2", @@ -90,7 +90,7 @@ from dropbox_sign import \ configuration = Configuration() with ApiClient(configuration) as api_client: - api = apis.OAuthApi(api_client) + oauth_api = apis.OAuthApi(api_client) data = models.OAuthTokenRefreshRequest( refresh_token="hNTI2MTFmM2VmZDQxZTZjOWRmZmFjZmVmMGMyNGFjMzI2MGI5YzgzNmE3", diff --git a/sdks/python/templates/gitignore.mustache b/sdks/python/templates/gitignore.mustache index 609c20138..62f505ef1 100644 --- a/sdks/python/templates/gitignore.mustache +++ b/sdks/python/templates/gitignore.mustache @@ -68,4 +68,5 @@ target/ {{#useCustomTemplateCode}} .openapi-generator /vendor -{{/useCustomTemplateCode}} \ No newline at end of file +/.github/workflows/python.yml +{{/useCustomTemplateCode}} diff --git a/src/Hello/Release/UpdateVersion.php b/src/Hello/Release/UpdateVersion.php index 2c1363d31..e6ae7bd59 100644 --- a/src/Hello/Release/UpdateVersion.php +++ b/src/Hello/Release/UpdateVersion.php @@ -34,6 +34,7 @@ class UpdateVersion 'openapi-config.yaml', 'pom.xml', 'src/main/java/com/dropbox/sign/ApiClient.java', + 'src/main/java/com/dropbox/sign/Configuration.java', ]; private const FILES_JAVA_V2 = [ @@ -45,6 +46,7 @@ class UpdateVersion 'openapi-config.yaml', 'pom.xml', 'src/main/java/com/dropbox/sign/ApiClient.java', + 'src/main/java/com/dropbox/sign/Configuration.java', ]; private const FILES_NODE = [ @@ -71,6 +73,7 @@ class UpdateVersion 'dropbox_sign/api_client.py', 'dropbox_sign/configuration.py', 'openapi-config.yaml', + 'pyproject.toml', 'setup.py', ];