bump td to v1.8.47

Author: up9cloud

.github/workflows/main.yml

@@ -1,9 +1,5 @@
-name: Releases
-
 on: 
   push:
-    tags:
-    - '*'
 
 jobs:
   build:
@@ -24,14 +20,9 @@ jobs:
           allowUpdates: true
           artifacts: "libs.tar.gz,jniLibs.tar.gz"
           token: ${{ secrets.GITHUB_TOKEN }}
-      - uses: gradle/wrapper-validation-action@v1
       - run: |
           cp -r ./jniLibs ./app/src/main/
-      - uses: actions/setup-java@v3
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-          cache: 'gradle'
+      - uses: gradle/actions/wrapper-validation@v4
       - run: |
           ./gradlew assembleRelease publish
       - uses: up9cloud/action-notify@master

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2024 https://github.com/up9cloud
+Copyright (c) 2021-Present https://github.com/up9cloud
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -4,7 +4,9 @@
 
 Prebuilt [libtdjson](https://github.com/tdlib/td) for Android
 
-`Version` tag is same as the version of tdlib
+> Version
+
+- Git tag is same as the version of tdlib
 
 > Releases
 
@@ -28,94 +30,72 @@ Prebuilt [libtdjson](https://github.com/tdlib/td) for Android
 
 > Method 1: Download jniLibs
 
-- Download jniLibs.tar.gz (from `Releases`) and extract it to your ./app/`src/main/jniLibs/`
-- Copy `./app/src/main/java/io/github/up9cloud/td/JsonClient.java` to your repo
-
-> TODO: Method 2: Download .jar
-
-- Download .jar file (from `Packages`) to your ./app/`libs/`
-- Be sure "*.jar" is the part of dependencies in your `build.gradle` file
-
-    ```gradle
-    dependencies {
-        implementation fileTree(dir: "libs", include: ["*.jar"])
-    }
-    ```
+- Download `jniLibs.tar.gz` (from `Releases`) and extract it to your ./app/`src/main/jniLibs/`
+- Download `./app/src/main/java/io/github/up9cloud/td/JsonClient.java` and put to your code base.
 
-> Method 3: Github Maven
+> Method 2: Github Maven
 
 - Add those to your `build.gradle` file
 
-    ```gradle
-    repositories {
-        google()
-        ...
-        maven {
-            name = "GitHubPackages"
-            url = uri("https://maven.pkg.github.com/up9cloud/android-libtdjson")
-            credentials {
-                username = System.getenv("GITHUB_ACTOR")
-                password = System.getenv("GITHUB_TOKEN")
-            }
-        }
+  ```gradle
+  repositories {
+    google()
+    ...
+    maven {
+      name = "GitHubPackages"
+      url = uri("https://maven.pkg.github.com/up9cloud/android-libtdjson")
+      credentials {
+        username = System.getenv("GITHUB_ACTOR")
+        password = System.getenv("GITHUB_TOKEN")
+      }
     }
-    dependencies {
-        // Modify the version, see release
-        implementation 'io.github.up9cloud:td:<version>'
-    }
-    ```
+  }
+  dependencies {
+    // Modify the version, see release
+    implementation 'io.github.up9cloud:td:<version>'
+  }
+  ```
 
 - Setup ENVs
 
-    ```bash
-    export GITHUB_ACTOR=<your github account>
-    export GITHUB_TOKEN=<your github personal access token>
-    ```
+  ```bash
+  export GITHUB_ACTOR=<your github account>
+  export GITHUB_TOKEN=<your github personal access token>
+  ```
 
 Other refs:
 
 - GitHub Docs - [Gradle registry](https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-gradle-registry#installing-a-package)
 - [enefce/AndroidLibraryForGitHubPackagesDemo](https://github.com/enefce/AndroidLibraryForGitHubPackagesDemo)
 
-## Usage
-
-TODO
-
-## Example
-
-TODO
-
 ## Dev memo
 
-### Bump the version of tdlib
-
-- Modify the version for git checkout in `./prepare.sh`
-- Modify the getVersionName function in `./app/build.gradle`
-- Git commit (message example: `bump td to vx.x.x`)
-- Git add tag (`git tag vx.x.x`, the tag version should be same as the version of tdlib)
-- Push with tags (`git push && git push --tags`)
-- Wait for CI task
-
-### Build on local, see `.github/workflows/main.yml` also
-
-```console
-$ docker run --rm -it -v `pwd`:/app sstc/android-ndk /bin/bash
-
-# ./build.sh
-```
-
-### Cleanup generated .so files for strip testing
-
-```bash
-rm -fr \
+- Bump the version of tdlib
+  - Modify the version for git checkout in `./prepare.sh`
+  - Modify the getVersionName function in `./app/build.gradle`
+  - Git commit (message example: `bump td to vx.x.x`)
+  - Git add tag (`git tag vx.x.x`, the tag version should be same as the version of tdlib)
+  - Push with tags (`git push && git push --tags`)
+  - Wait for CI task
+- Build on local, see `.github/workflows/main.yml` also
+
+  ```bash
+  # cleanup generated .so files for strip testing
+  rm -fr \
     ./build/jni/**/*.so \
     ./build/jni/**/td/*.so \
     ./build/td/**/*.so \
     ./jniLibs \
     ./libs
 
-./build.sh
-```
+  docker run --rm -v $(pwd):/app sstc/android-ndk ./build.sh
+  ```
+
+- update gradle
+
+  ```bash
+  docker run --rm -v $(pwd):/app sstc/android-ndk ./gradlew wrapper --gradle-version latest
+  ```
 
 - `.travis.yml`: Travis CI has build time limitation (1 hour), and building this lib needs much more than it, so can't build on it.
 

app/build.gradle

@@ -7,24 +7,26 @@ def getGroupId = { ->
 }
 
 def getVersionName = { ->
-    return "1.8.31"
+    return "1.8.47"
 }
 
-def getArtificatId = { ->
+def getArtifactId = { ->
     return "td" // For less confusing, set it as the suffix from `package xxx.xxx.xxx.<suffix>`
 }
 
 android {
-    ndkVersion "22.1.7171670"
-    compileSdkVersion 30
-    namespace getGroupId()
+    ndkVersion = "28.0.13004108"
+    compileSdkVersion = 35
+    namespace = getGroupId()
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName getVersionName()
-        archivesBaseName = getArtificatId()
+        base {
+            archivesName = getArtifactId()
+        }
     }
     buildTypes {
         release {
@@ -47,7 +49,7 @@ android {
     //     externalNativeBuild {
     //         cmake {
     //             arguments "-CMAKE_BUILD_TYPE=MinSizeRel", "-DANDROID_TOOLCHAIN=clang", "-DANDROID_STL=c++_static"
-    //             abiFilters  'arm64-v8a', 'armeabi-v7a', 'x86_64'
+    //             abiFilters 'arm64-v8a', 'armeabi-v7a', 'x86_64'
     //         }
     //     }
     // }
@@ -69,10 +71,10 @@ afterEvaluate {
         }
         publications {
             gpr(MavenPublication) {
-                from components.release
-                groupId getGroupId()
-                artifactId getArtificatId()
-                version getVersionName()
+                from = components.release
+                groupId = getGroupId()
+                artifactId = getArtifactId()
+                version = getVersionName()
             }
         }
     }

app/src/main/cpp/CMakeLists.txt

@@ -32,7 +32,7 @@ if (CMAKE_CROSSCOMPILING)
     # E/linker  ... /lib/x86_64/libtdjson.so" has unsupported e_shentsize: 0x0 (expected 0x40)
     COMMAND ${CMAKE_STRIP} --strip-debug --strip-unneeded $<TARGET_FILE:tdjson_android> -o "${root_DIR}/jniLibs/${ANDROID_ABI}/libtdjson.so"
   )
-  # TODO: don't know how to assgin target of sub folder, so strip in build.sh instead here.
+  # TODO: don't know how to assign target of sub folder, so strip in build.sh instead here.
   # add_custom_command(TARGET ??? POST_BUILD
   #   COMMAND ${CMAKE_COMMAND} -E rename $<TARGET_FILE:tdjson_android> $<TARGET_FILE:tdjson_android>.debug
   #   COMMAND ${CMAKE_COMMAND} -E make_directory "${root_DIR}/libs/${ANDROID_ABI}"

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         // https://developer.android.com/build/releases/gradle-plugin#updating-gradle
         // https://gradle.org/releases/
         // https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
-        classpath "com.android.tools.build:gradle:8.1.1"
+        classpath "com.android.tools.build:gradle:8.9.1"
     }
 }
 

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists