update deps

vvb2060 · Jul 28, 2024 · d9b69e6 · d9b69e6
1 parent 06e0418
commit d9b69e6
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 46 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -5,22 +5,25 @@ plugins {
 }
 
 android {
-    compileSdkVersion 34
-    buildToolsVersion '34.0.0'
-    ndkVersion '26.1.10909125'
-    namespace 'io.github.vvb2060.ndk.boringssl.test'
+    compileSdk = 35
+    buildToolsVersion = '35.0.0'
+    ndkVersion = '27.0.11902837'
+    namespace = 'io.github.vvb2060.ndk.boringssl.test'
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 34
-        versionCode 5
-        versionName 'android-14.0.0_r18'
-        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
+        minSdk = 21
+        targetSdk = 35
+        versionCode = 6
+        versionName = 'android-14.0.0_r54'
+        testInstrumentationRunner = 'androidx.test.runner.AndroidJUnitRunner'
         externalNativeBuild {
             ndkBuild {
-                arguments "-j${Runtime.runtime.availableProcessors()}", "APP_LDFLAGS+=-flto"
-                cFlags "-flto"
+                arguments += [ "-j${Runtime.runtime.availableProcessors()}" ]
+                abiFilters += [ "x86", "x86_64", "armeabi-v7a", "arm64-v8a", "riscv64" ]
             }
         }
+        ndk {
+            debugSymbolLevel = "FULL"
+        }
     }
 
     buildTypes {
@@ -29,6 +32,11 @@ android {
             shrinkResources = true
             signingConfig = signingConfigs.debug
             proguardFiles("proguard-rules.pro")
+            externalNativeBuild {
+                ndkBuild {
+                    arguments += [ "enableLTO=1" ]
+                }
+            }
         }
     }
 
@@ -39,18 +47,26 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 
     buildFeatures {
-        buildConfig false
-        prefab true
+        buildConfig = false
+        prefab = true
+    }
+
+    lint {
+        checkReleaseBuilds = false
+    }
+
+    dependenciesInfo {
+        includeInApk = false
     }
 
     packagingOptions {
         jniLibs {
-            useLegacyPackaging false
+            useLegacyPackaging = false
         }
     }
 
@@ -74,6 +90,6 @@ android {
 
 dependencies {
 //    implementation 'io.github.vvb2060.ndk:boringssl:4.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test:rules:1.5.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test:rules:1.6.1'
 }
diff --git a/boringssl/build.gradle b/boringssl/build.gradle
@@ -4,16 +4,22 @@ plugins {
     id 'signing'
 }
 
+def enableLTO = providers.gradleProperty("enableLTO")
+
 android {
-    compileSdkVersion 34
-    buildToolsVersion '34.0.0'
-    ndkVersion '26.1.10909125'
-    namespace 'io.github.vvb2060.ndk.boringssl'
+    compileSdk = 35
+    buildToolsVersion = '35.0.0'
+    ndkVersion = '27.0.11902837'
+    namespace = 'io.github.vvb2060.ndk.boringssl'
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 34
+        minSdk = 21
+        targetSdk = 35
         externalNativeBuild {
-            ndkBuild.arguments "-j${Runtime.runtime.availableProcessors()}"
+            ndkBuild {
+                arguments += [ "-j${Runtime.runtime.availableProcessors()}" ]
+                if (enableLTO.present) arguments += [ "enableLTO=1" ]
+                abiFilters += [ "x86", "x86_64", "armeabi-v7a", "arm64-v8a", "riscv64" ]
+            }
         }
     }
 
@@ -22,13 +28,13 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 
     buildFeatures {
-        buildConfig false
-        prefabPublishing true
+        buildConfig = false
+        prefabPublishing = true
     }
 
     prefab {
@@ -53,7 +59,11 @@ publishing {
         mavenJava(MavenPublication) {
             group 'io.github.vvb2060.ndk'
             artifactId 'boringssl'
-            version '4.0'
+            if (enableLTO.present) {
+                version '4.1-lto-ndk27'
+            } else {
+                version '4.1'
+            }
             afterEvaluate {
                 from components.release
             }

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -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.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ 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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

diff --git a/gradlew.bat b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,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
 
@@ -57,11 +59,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
 

diff --git a/settings.gradle b/settings.gradle
@@ -5,9 +5,9 @@ pluginManagement {
         mavenCentral()
     }
     plugins {
-        id 'com.android.application' version '8.2.0'
-        id 'com.android.library' version '8.2.0'
-        id 'org.jetbrains.kotlin.android' version '1.9.20'
+        id 'com.android.application' version '8.5.1'
+        id 'com.android.library' version '8.5.1'
+        id 'org.jetbrains.kotlin.android' version '2.0.0'
     }
 }
 dependencyResolutionManagement {