Skip to content

Commit

Permalink
update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
vvb2060 committed Feb 7, 2025
1 parent 46a7ad5 commit a881539
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 23 deletions.
17 changes: 12 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ If you only want to use curl tool, unzip apk, extract `libcurl.so` and rename it
Gradle:

```gradle
implementation("io.github.vvb2060.ndk:curl:8.10.0")
// or LTO version (~35MiB), it does not strip any debug info
implementation("io.github.vvb2060.ndk:curl:8.10.0-lto-ndk27")
implementation("io.github.vvb2060.ndk:curl:8.12.0")
// or LTO version (~40MiB), it does not strip any debug info
implementation("io.github.vvb2060.ndk:curl:8.12.0-lto-ndk28")
```

This library is [Prefab](https://google.github.io/prefab/), so you will need to enable it in your project (Android Gradle Plugin 4.1+):
Expand Down Expand Up @@ -73,14 +73,21 @@ target_link_libraries(app curl::curl_static)

## Version

### 8.12.0
- curl 8.12.0
- nghttp2 1.64.0
- nghttp3 1.7.0
- ngtcp2 1.10.0
- boringssl 20250114

<details>

### 8.10.0
- curl 8.10.0
- nghttp2 1.63.0
- nghttp3 1.5.0
- ngtcp2 1.7.0

<details>

### 8.9.1
- curl 8.9.1
- nghttp2 1.62.1
Expand Down
12 changes: 6 additions & 6 deletions curl/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ def enableLTO = providers.gradleProperty("enableLTO")

android {
compileSdk = 35
buildToolsVersion = "35.0.0"
ndkVersion = "27.0.12077973"
buildToolsVersion = "35.0.1"
ndkVersion = "28.0.12674087"
namespace = "io.github.vvb2060.ndk.curl"
defaultConfig {
minSdk = 21
Expand Down Expand Up @@ -67,9 +67,9 @@ android {

dependencies {
if (enableLTO.present) {
api("io.github.vvb2060.ndk:boringssl:20241024-lto-ndk27")
api("io.github.vvb2060.ndk:boringssl:20250114-lto-ndk28")
} else {
api("io.github.vvb2060.ndk:boringssl:20241024")
api("io.github.vvb2060.ndk:boringssl:20250114")
}
}

Expand All @@ -79,9 +79,9 @@ publishing {
group = "io.github.vvb2060.ndk"
artifactId = "curl"
if (enableLTO.present) {
version = "8.10.0-lto-ndk27"
version = "8.12.0-lto-ndk28"
} else {
version = "8.10.0"
version = "8.12.0"
}
afterEvaluate {
from(components.release)
Expand Down
1 change: 0 additions & 1 deletion curl/src/main/native/Application.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ APP_CFLAGS += -Wno-builtin-macro-redefined -D__FILE__=__FILE_NAME__
APP_CONLYFLAGS := -std=c2x
APP_LDFLAGS := -Wl,--icf=all
APP_STL := none
APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true

ifeq ($(enableLTO),1)
APP_CFLAGS += -flto
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
3 changes: 1 addition & 2 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,7 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
6 changes: 3 additions & 3 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ pluginManagement {
mavenCentral()
}
plugins {
id("com.android.application") version "8.6.0"
id("com.android.library") version "8.6.0"
id("org.jetbrains.kotlin.android") version "2.0.20"
id("com.android.application") version "8.8.0"
id("com.android.library") version "8.8.0"
id("org.jetbrains.kotlin.android") version "2.1.10"
}
}
dependencyResolutionManagement {
Expand Down
8 changes: 4 additions & 4 deletions tool/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ plugins {

android {
compileSdk = 35
buildToolsVersion = "35.0.0"
ndkVersion = "27.0.12077973"
buildToolsVersion = "35.0.1"
ndkVersion = "28.0.12674087"
namespace = "io.github.vvb2060.ndk.curl"
defaultConfig {
applicationId = "io.github.vvb2060.ndk.curl"
Expand Down Expand Up @@ -69,6 +69,6 @@ android {
}

dependencies {
releaseImplementation("io.github.vvb2060.ndk:boringssl:20241024-lto-ndk27")
debugImplementation("io.github.vvb2060.ndk:boringssl:20241024")
releaseImplementation("io.github.vvb2060.ndk:boringssl:20250114-lto-ndk28")
debugImplementation("io.github.vvb2060.ndk:boringssl:20250114")
}
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(buildView());
apkPath = getApplicationInfo().sourceDir;
editText.setText("-s --http3-only --curves X25519MLKEM768 --ech true --doh-url https://1.1/dns-query https://" + UUID.randomUUID() + ".encryptedsni.com/cdn-cgi/trace");
editText.setText("--compressed --http3-only --curves X25519MLKEM768 --ech true --doh-url https://1.1/dns-query https://" + UUID.randomUUID() + ".encryptedsni.com/cdn-cgi/trace");
editText.dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_ENTER));
}

Expand Down

0 comments on commit a881539

Please sign in to comment.