Switch to gradle-license-plugin (#4160)

* switch to gradle-license-plugin

* generate licenseReleaseReport
This commit is contained in:
ᡠᠵᡠᡳ ᡠᠵᡠ ᠮᠠᠨᡩ᠋ᠠᠨ 2024-12-21 10:40:20 +08:00 committed by GitHub
parent 54d520727e
commit 70f1743114
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 1297 additions and 11 deletions

View file

@ -61,6 +61,7 @@ jobs:
run: | run: |
cd ${{ github.workspace }}/V2rayNG cd ${{ github.workspace }}/V2rayNG
chmod 755 gradlew chmod 755 gradlew
./gradlew licenseReleaseReport
./gradlew assembleRelease -Pandroid.injected.signing.store.file=${{ steps.android_keystore.outputs.filePath }} -Pandroid.injected.signing.store.password=${{ secrets.APP_KEYSTORE_PASSWORD }} -Pandroid.injected.signing.key.alias=${{ secrets.APP_KEYSTORE_ALIAS }} -Pandroid.injected.signing.key.password=${{ secrets.APP_KEY_PASSWORD }} ./gradlew assembleRelease -Pandroid.injected.signing.store.file=${{ steps.android_keystore.outputs.filePath }} -Pandroid.injected.signing.store.password=${{ secrets.APP_KEYSTORE_PASSWORD }} -Pandroid.injected.signing.key.alias=${{ secrets.APP_KEYSTORE_ALIAS }} -Pandroid.injected.signing.key.password=${{ secrets.APP_KEY_PASSWORD }}
- name: Upload arm64-v8a APK - name: Upload arm64-v8a APK
@ -82,4 +83,4 @@ jobs:
if: ${{ success() }} if: ${{ success() }}
with: with:
name: x86-apk name: x86-apk
path: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/release/*x86*.apk path: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/release/*x86*.apk

View file

@ -1,7 +1,7 @@
plugins { plugins {
alias(libs.plugins.android.application) alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.android)
id("com.google.android.gms.oss-licenses-plugin") id("com.jaredsburrows.license")
} }
android { android {
@ -146,6 +146,4 @@ dependencies {
androidTestImplementation(libs.androidx.espresso.core) androidTestImplementation(libs.androidx.espresso.core)
testImplementation(libs.org.mockito.mockito.inline) testImplementation(libs.org.mockito.mockito.inline)
testImplementation(libs.mockito.kotlin) testImplementation(libs.mockito.kotlin)
// Oss Licenses
implementation(libs.play.services.oss.licenses)
} }

File diff suppressed because it is too large Load diff

View file

@ -20,7 +20,6 @@ import com.v2ray.ang.util.ZipUtil
import java.io.File import java.io.File
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.Locale import java.util.Locale
import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
class AboutActivity : BaseActivity() { class AboutActivity : BaseActivity() {
@ -90,7 +89,12 @@ class AboutActivity : BaseActivity() {
Utils.openUri(this, AppConfig.v2rayNGIssues) Utils.openUri(this, AppConfig.v2rayNGIssues)
} }
binding.layoutOssLicenses.setOnClickListener{ binding.layoutOssLicenses.setOnClickListener{
startActivity(Intent(this, OssLicensesMenuActivity::class.java)) val webView = android.webkit.WebView(this);
webView.loadUrl("file:///android_asset/open_source_licenses.html");
android.app.AlertDialog.Builder(this)
.setTitle("Open source licenses")
.setView(webView)
.setPositiveButton("OK", android.content.DialogInterface.OnClickListener { dialog, whichButton -> dialog.dismiss() }).show()
} }
binding.layoutTgChannel.setOnClickListener { binding.layoutTgChannel.setOnClickListener {

View file

@ -7,7 +7,7 @@ plugins {
buildscript { buildscript {
dependencies { dependencies {
classpath(libs.oss.licenses.plugin) classpath(libs.gradle.license.plugin)
} }
} }

View file

@ -1,5 +1,6 @@
[versions] [versions]
agp = "8.7.2" agp = "8.7.2"
gradleLicensePlugin = "0.9.8"
kotlin = "2.1.0" kotlin = "2.1.0"
coreKtx = "1.15.0" coreKtx = "1.15.0"
junit = "4.13.2" junit = "4.13.2"
@ -11,8 +12,6 @@ activity = "1.9.3"
constraintlayout = "2.2.0" constraintlayout = "2.2.0"
mmkvStatic = "1.3.11" mmkvStatic = "1.3.11"
gson = "2.11.0" gson = "2.11.0"
ossLicensesPlugin = "0.10.6"
playServicesOssLicenses = "17.1.0"
rxjava = "3.1.9" rxjava = "3.1.9"
rxandroid = "3.0.2" rxandroid = "3.0.2"
rxpermissions = "0.12" rxpermissions = "0.12"
@ -29,6 +28,7 @@ preferenceKtx = "1.2.1"
recyclerview = "1.3.2" recyclerview = "1.3.2"
[libraries] [libraries]
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
gradle-license-plugin = { module = "com.jaredsburrows:gradle-license-plugin", version.ref = "gradleLicensePlugin" }
junit = { group = "junit", name = "junit", version.ref = "junit" } junit = { group = "junit", name = "junit", version.ref = "junit" }
androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" } androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
@ -38,8 +38,6 @@ androidx-activity = { group = "androidx.activity", name = "activity", version.re
androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" } androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
mmkv-static = { module = "com.tencent:mmkv-static", version.ref = "mmkvStatic" } mmkv-static = { module = "com.tencent:mmkv-static", version.ref = "mmkvStatic" }
gson = { module = "com.google.code.gson:gson", version.ref = "gson" } gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
oss-licenses-plugin = { module = "com.google.android.gms:oss-licenses-plugin", version.ref = "ossLicensesPlugin" }
play-services-oss-licenses = { module = "com.google.android.gms:play-services-oss-licenses", version.ref = "playServicesOssLicenses" }
rxjava = { module = "io.reactivex.rxjava3:rxjava", version.ref = "rxjava" } rxjava = { module = "io.reactivex.rxjava3:rxjava", version.ref = "rxjava" }
rxandroid = { module = "io.reactivex.rxjava3:rxandroid", version.ref = "rxandroid" } rxandroid = { module = "io.reactivex.rxjava3:rxandroid", version.ref = "rxandroid" }
rxpermissions = { module = "com.github.tbruyelle:rxpermissions", version.ref = "rxpermissions" } rxpermissions = { module = "com.github.tbruyelle:rxpermissions", version.ref = "rxpermissions" }