Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
vvb2060 committed Feb 7, 2024
1 parent 0cc99a9 commit 5a011c5
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 20 deletions.
13 changes: 8 additions & 5 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
name: Build

on: [ push, pull_request ]
on:
pull_request:
push:
branches:

jobs:
build:
Expand All @@ -13,11 +16,11 @@ jobs:

steps:
- name: Check out
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: 'recursive'
- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
Expand All @@ -42,12 +45,12 @@ jobs:
./gradlew :t:assembleRelease
./gradlew publishToMavenLocal
- name: Upload app
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.os }}-app
path: tool/build/outputs
- name: Upload library
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.os }}-library
path: ~/.m2
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ 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.5.0'
implementation 'io.github.vvb2060.ndk:curl:8.6.0'
```

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 @@ -71,6 +71,12 @@ target_link_libraries(app curl::curl_static)

## Version

### 8.6.0
- curl 8.6.0
- nghttp2 1.59.0
- nghttp3 1.1.0
- ngtcp2 1.2.0

### 8.5.0
- curl 8.5.0
- nghttp2 1.58.0
Expand Down
4 changes: 2 additions & 2 deletions curl/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,15 @@ android {
}

dependencies {
api("io.github.vvb2060.ndk:boringssl:3.1")
api("io.github.vvb2060.ndk:boringssl:4.0")
}

publishing {
publications {
mavenJava(MavenPublication) {
group = "io.github.vvb2060.ndk"
artifactId = "curl"
version = "8.5.0"
version = "8.6.0"
afterEvaluate {
from(components.release)
}
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.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
20 changes: 10 additions & 10 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand All @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand Down
2 changes: 1 addition & 1 deletion tool/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@ android {
}

dependencies {
implementation("io.github.vvb2060.ndk:boringssl:3.1")
implementation("io.github.vvb2060.ndk:boringssl:4.0")
}

0 comments on commit 5a011c5

Please sign in to comment.