From bb83f0890622b2c58d0b062ce6c3dd5b58e9d84d Mon Sep 17 00:00:00 2001 From: Alexande B Date: Sun, 26 Jan 2025 09:50:10 +0100 Subject: [PATCH 1/2] chore: bump version 4.0.4 --- CHANGES.md | 4 ++++ compose-sdk/build.gradle | 4 ++-- sdk/build.gradle | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index d7a9829..0026bcf 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,9 @@ # Changelog +# 4.0.4 + += Downgrade: jackson-databind to 2.13.* (#170) + # 4.0.3 - Upgrade: third-party dependencies (lombok, jackson-databind) (#167) diff --git a/compose-sdk/build.gradle b/compose-sdk/build.gradle index 6088b2c..daf32af 100644 --- a/compose-sdk/build.gradle +++ b/compose-sdk/build.gradle @@ -20,11 +20,11 @@ android { // See https://developer.android.com/studio/publish/versioning // versionCode must be integer and be incremented by one for every new update // android system uses this to prevent downgrades - versionCode 42 + versionCode 43 // version number visible to the user // should follow semantic versioning (See https://semver.org) - versionName "4.0.3" + versionName "4.0.4" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" diff --git a/sdk/build.gradle b/sdk/build.gradle index 673a245..ccd23f7 100644 --- a/sdk/build.gradle +++ b/sdk/build.gradle @@ -28,11 +28,11 @@ android { // See https://developer.android.com/studio/publish/versioning // versionCode must be integer and be incremented by one for every new update // android system uses this to prevent downgrades - versionCode 42 + versionCode 43 // version number visible to the user // should follow semantic versioning (See https://semver.org) - versionName "4.0.3" + versionName "4.0.4" buildConfigField 'String', 'VERSION_NAME', "\"${defaultConfig.versionName}_${defaultConfig.versionCode}\"" From 3565bf09adc570dcd03702f80b2c2750e809a1ce Mon Sep 17 00:00:00 2001 From: Alexande B Date: Sun, 26 Jan 2025 09:59:13 +0100 Subject: [PATCH 2/2] chore: upgrade compile sdk to 35 --- .github/workflows/ci.yml | 5 ++++- compose-sdk/build.gradle | 2 +- example-app/build.gradle | 4 ++-- example-compose-app/build.gradle | 4 ++-- sdk/build.gradle | 4 ++-- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 19c8e3e..867e765 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,6 +48,9 @@ jobs: fail-fast: false matrix: include: + - compile: 35 + target: 34 + appcompat: 1.6.1 - compile: 34 target: 34 appcompat: 1.6.1 @@ -58,7 +61,7 @@ jobs: target: 32 appcompat: 1.4.2 - compile: 34 - target: 30 + target: 31 appcompat: 1.3.1 - compile: 34 target: 30 diff --git a/compose-sdk/build.gradle b/compose-sdk/build.gradle index daf32af..de0eba1 100644 --- a/compose-sdk/build.gradle +++ b/compose-sdk/build.gradle @@ -12,7 +12,7 @@ plugins { android { namespace 'com.hcaptcha.compose' - compileSdk 34 + compileSdk 35 defaultConfig { minSdk 23 diff --git a/example-app/build.gradle b/example-app/build.gradle index 370a801..3c28249 100644 --- a/example-app/build.gradle +++ b/example-app/build.gradle @@ -11,12 +11,12 @@ def prop(name, fallback) { } android { - compileSdk intProp("exampleCompileSdkVersion", 34) + compileSdk intProp("exampleCompileSdkVersion", 35) namespace 'com.hcaptcha.example' defaultConfig { minSdkVersion 23 - targetSdkVersion intProp("exampleTargetSdkVersion", 34) + targetSdkVersion intProp("exampleTargetSdkVersion", 35) versionCode 1 versionName "0.0.1" diff --git a/example-compose-app/build.gradle b/example-compose-app/build.gradle index 8f19ed9..9a6b411 100644 --- a/example-compose-app/build.gradle +++ b/example-compose-app/build.gradle @@ -8,12 +8,12 @@ def intProp(name, fallback) { } android { - compileSdk intProp("exampleCompileSdkVersion", 34) + compileSdk intProp("exampleCompileSdkVersion", 35) namespace 'com.hcaptcha.example.compose' defaultConfig { minSdkVersion 23 - targetSdkVersion intProp("exampleTargetSdkVersion", 34) + targetSdkVersion intProp("exampleTargetSdkVersion", 35) versionCode 1 versionName "0.0.1" diff --git a/sdk/build.gradle b/sdk/build.gradle index ccd23f7..1ba1980 100644 --- a/sdk/build.gradle +++ b/sdk/build.gradle @@ -14,7 +14,7 @@ ext { } android { - compileSdk 34 + compileSdk 35 namespace 'com.hcaptcha.sdk' buildFeatures { @@ -23,7 +23,7 @@ android { defaultConfig { minSdkVersion 16 - targetSdkVersion 34 + targetSdkVersion 35 // See https://developer.android.com/studio/publish/versioning // versionCode must be integer and be incremented by one for every new update