xDL version upgrade to 2.0.0.

caikelun · caikelun · commit 6edc5e5c69ab · 2023-03-03T14:29:41.000+08:00
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2021 HexHacking Team
+Copyright (c) 2020-2023 HexHacking Team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 ![](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat)
 ![](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat)
-![](https://img.shields.io/badge/release-1.2.1-red.svg?style=flat)
+![](https://img.shields.io/badge/release-2.0.0-red.svg?style=flat)
 ![](https://img.shields.io/badge/Android-4.1%20--%2013-blue.svg?style=flat)
 ![](https://img.shields.io/badge/arch-armeabi--v7a%20%7C%20arm64--v8a%20%7C%20x86%20%7C%20x86__64-blue.svg?style=flat)
 
@@ -61,10 +61,25 @@ android {
 }
 
 dependencies {
-    implementation 'io.github.hexhacking:xdl:1.2.1'
+    implementation 'io.github.hexhacking:xdl:2.0.0'
 }
 ```
 
+**NOTE**:
+
+1. Starting from version `2.0.0` of xDL, group ID changed from `io.hexhacking` to `io.github.hexhacking`.
+
+| version range  | group ID                 | artifact ID | Repository URL |
+|:---------------|:-------------------------|:------------| :--------------|
+| [1.0.3, 1.2.1] | io.hexhacking            | xdl         | [repo](https://repo1.maven.org/maven2/io/hexhacking/xdl/) |
+| [2.0.0, )      | **io.github.hexhacking** | xdl         | [repo](https://repo.maven.apache.org/maven2/io/github/hexhacking/xdl/) |
+
+2. xDL uses the [prefab package schema v2](https://github.com/google/prefab/releases/tag/v2.0.0), which is configured by default since [Android Gradle Plugin 7.1.0](https://developer.android.com/studio/releases/gradle-plugin?buildsystem=cmake#7-1-0). If you are using Android Gradle Plugin earlier than 7.1.0, please add the following configuration to `gradle.properties`:
+
+```
+android.prefabVersion=2.0.0
+```
+
 ### 2. Add dependency in CMakeLists.txt or Android.mk
 
 > CMakeLists.txt
diff --git a/README.zh-CN.md b/README.zh-CN.md
@@ -2,7 +2,7 @@
 
 ![](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat)
 ![](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat)
-![](https://img.shields.io/badge/release-1.2.1-red.svg?style=flat)
+![](https://img.shields.io/badge/release-2.0.0-red.svg?style=flat)
 ![](https://img.shields.io/badge/Android-4.1%20--%2013-blue.svg?style=flat)
 ![](https://img.shields.io/badge/arch-armeabi--v7a%20%7C%20arm64--v8a%20%7C%20x86%20%7C%20x86__64-blue.svg?style=flat)
 
@@ -61,10 +61,25 @@ android {
 }
 
 dependencies {
-    implementation 'io.github.hexhacking:xdl:1.2.1'
+    implementation 'io.github.hexhacking:xdl:2.0.0'
 }
 ```
 
+**注意**：
+
+1. xDL 从版本 `2.0.0` 开始，group ID 从 `io.hexhacking` 改为 `io.github.hexhacking`。
+
+| 版本号范围          | group ID                 | artifact ID | 仓库 URL                                                                 |
+|:---------------|:-------------------------|:------------|:-----------------------------------------------------------------------|
+| [1.0.3, 1.2.1] | io.hexhacking            | xdl         | [repo](https://repo1.maven.org/maven2/io/hexhacking/xdl/)              |
+| [2.0.0, )      | **io.github.hexhacking** | xdl         | [repo](https://repo.maven.apache.org/maven2/io/github/hexhacking/xdl/) |
+
+2. xDL 使用 [prefab package schema v2](https://github.com/google/prefab/releases/tag/v2.0.0)，它是从 [Android Gradle Plugin 7.1.0](https://developer.android.com/studio/releases/gradle-plugin?buildsystem=cmake#7-1-0) 开始作为默认配置的。如果你使用的是 Android Gradle Plugin 7.1.0 之前的版本，请在 `gradle.properties` 中加入以下配置：
+
+```
+android.prefabVersion=2.0.0
+```
+
 ### 2. 在 CMakeLists.txt 或 Android.mk 中增加依赖
 
 > CMakeLists.txt
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
-    id 'com.android.application' version '7.2.2' apply false
-    id 'com.android.library' version '7.2.2' apply false
+    id 'com.android.application' version '7.4.2' apply false
+    id 'com.android.library' version '7.4.2' apply false
 }
 
 task clean(type: Delete) {
@@ -11,17 +11,18 @@ ext {
     minSdkVersion = 16
     compileSdkVersion = 33
     targetSdkVersion = 33
-    buildToolsVersion = "33.0.1"
-    javaVersion = JavaVersion.VERSION_1_7
+    buildToolsVersion = "33.0.2"
+    javaVersion = JavaVersion.VERSION_1_8
     ndkVersion = "23.2.8568313"
     cmakeVersion = "3.22.1"
     abiFilters = "armeabi-v7a,arm64-v8a,x86,x86_64"
     useASAN = false
     dependencyOnLocalLibrary = true
+    xdlVersion = "2.0.0"
 
     POM_GROUP_ID = "io.github.hexhacking"
     POM_ARTIFACT_ID = "xdl"
-    POM_VERSION_NAME = "1.2.1"
+    POM_VERSION_NAME = "2.0.0"
 
     POM_NAME = "xDL Android Lib"
     POM_DESCRIPTION = "xDL is an enhanced implementation of the Android DL series functions."
diff --git a/gradle.properties b/gradle.properties
@@ -16,4 +16,5 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
+android.enableJetifier=true
+android.disableAutomaticComponentCreation=true
diff --git a/gradle/publish.gradle b/gradle/publish.gradle
@@ -22,32 +22,14 @@ if (secretPropsFile.exists()) {
     ext["ossrhPassword"] = System.getenv('OSSRH_PASSWORD')
 }
 
-task sourcesJar(type: Jar) {
-    archiveClassifier.set("sources")
-    from android.sourceSets.main.java.srcDirs
-}
-
-task javadoc(type: Javadoc) {
-    source = android.sourceSets.main.java.sourceFiles
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-}
-
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    archiveClassifier.set("javadoc")
-    from javadoc.destinationDir
-}
-
 project.afterEvaluate {
     publishing {
         publications {
             release(MavenPublication) {
                 from components.release
 
-                artifact sourcesJar
-                artifact javadocJar
-
-                artifactId POM_ARTIFACT_ID
                 groupId POM_GROUP_ID
+                artifactId POM_ARTIFACT_ID
                 version POM_VERSION_NAME
 
                 pom {
@@ -84,9 +66,9 @@ project.afterEvaluate {
             maven {
                 name = "sonatype"
 
-                def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
-                def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
-                url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
+                def releasesRepoUrl = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
+                def snapshotsRepoUrl = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
+                url = POM_VERSION_NAME.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
 
                 credentials {
                     username ossrhUsername
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
diff --git a/settings.gradle b/settings.gradle
@@ -10,6 +10,7 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
+        maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" }
     }
 }
 rootProject.name = "xDL"
diff --git a/xdl/build.gradle b/xdl/build.gradle
@@ -3,6 +3,7 @@ plugins {
 }
 
 android {
+    namespace 'io.github.hexhacking.xdl'
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
     ndkVersion rootProject.ext.ndkVersion
@@ -40,12 +41,19 @@ android {
     }
     buildFeatures {
         prefabPublishing true
+        buildConfig false
     }
     prefab {
         xdl {
             headers "src/main/cpp/include"
         }
     }
+    publishing {
+        singleVariant('release') {
+            withSourcesJar()
+            withJavadocJar()
+        }
+    }
 }
 
 apply from: rootProject.file('gradle/publish.gradle')
diff --git a/xdl/src/main/AndroidManifest.xml b/xdl/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.github.hexhacking.xdl">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
diff --git a/xdl/src/main/cpp/include/xdl.h b/xdl/src/main/cpp/include/xdl.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2021 HexHacking Team
+// Copyright (c) 2020-2023 HexHacking Team
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -22,7 +22,7 @@
 // Created by caikelun on 2020-10-04.
 
 //
-// xDL version: 1.2.1
+// xDL version: 2.0.0
 //
 // xDL is an enhanced implementation of the Android DL series functions.
 // For more information, documentation, and the latest version please check:
diff --git a/xdl/src/main/cpp/xdl.c b/xdl/src/main/cpp/xdl.c
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2021 HexHacking Team
+// Copyright (c) 2020-2023 HexHacking Team
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/xdl/src/main/cpp/xdl_iterate.c b/xdl/src/main/cpp/xdl_iterate.c
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2021 HexHacking Team
+// Copyright (c) 2020-2023 HexHacking Team
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/xdl/src/main/cpp/xdl_iterate.h b/xdl/src/main/cpp/xdl_iterate.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2021 HexHacking Team
+// Copyright (c) 2020-2023 HexHacking Team
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/xdl/src/main/cpp/xdl_linker.c b/xdl/src/main/cpp/xdl_linker.c
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2021 HexHacking Team
+// Copyright (c) 2020-2023 HexHacking Team
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/xdl/src/main/cpp/xdl_linker.h b/xdl/src/main/cpp/xdl_linker.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2021 HexHacking Team
+// Copyright (c) 2020-2023 HexHacking Team
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/xdl/src/main/cpp/xdl_lzma.c b/xdl/src/main/cpp/xdl_lzma.c
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2021 HexHacking Team
+// Copyright (c) 2020-2023 HexHacking Team
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/xdl/src/main/cpp/xdl_lzma.h b/xdl/src/main/cpp/xdl_lzma.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2021 HexHacking Team
+// Copyright (c) 2020-2023 HexHacking Team
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/xdl/src/main/cpp/xdl_util.c b/xdl/src/main/cpp/xdl_util.c
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2021 HexHacking Team
+// Copyright (c) 2020-2023 HexHacking Team
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/xdl/src/main/cpp/xdl_util.h b/xdl/src/main/cpp/xdl_util.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2021 HexHacking Team
+// Copyright (c) 2020-2023 HexHacking Team
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/xdl_sample/build.gradle b/xdl_sample/build.gradle
@@ -3,6 +3,7 @@ plugins {
 }
 
 android {
+    namespace 'io.github.hexhacking.xdl.sample'
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
     ndkVersion rootProject.ext.ndkVersion
@@ -18,9 +19,6 @@ android {
         externalNativeBuild {
             cmake {
                 abiFilters rootProject.ext.abiFilters.split(",")
-                if (rootProject.ext.dependencyOnLocalLibrary) {
-                    arguments "-DDEPENDENCY_ON_LOCAL_LIBRARY=ON"
-                }
             }
         }
     }
@@ -34,8 +32,8 @@ android {
 //        }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility rootProject.ext.javaVersion
+        targetCompatibility rootProject.ext.javaVersion
     }
     buildTypes {
         debug {
@@ -59,14 +57,14 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.5.1'
-    implementation 'com.google.android.material:material:1.7.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.8.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 
     if (rootProject.ext.dependencyOnLocalLibrary) {
         implementation project(':xdl')
     } else {
-        implementation 'io.github.hexhacking:xdl:1.2.1'
+        implementation 'io.github.hexhacking:xdl:' + rootProject.ext.xdlVersion
     }
 }
 
diff --git a/xdl_sample/src/main/AndroidManifest.xml b/xdl_sample/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.github.hexhacking.xdl.sample">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:name=".MyCustomApplication"

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ dependencyResolutionManagement {`
`10`	`10`	`repositories {`
`11`	`11`	`google()`
`12`	`12`	`mavenCentral()`
	`13`	`+ maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" }`
`13`	`14`	`}`
`14`	`15`	`}`
`15`	`16`	`rootProject.name = "xDL"`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ plugins {`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`android {`
	`6`	`+ namespace 'io.github.hexhacking.xdl'`
`6`	`7`	`compileSdkVersion rootProject.ext.compileSdkVersion`
`7`	`8`	`buildToolsVersion rootProject.ext.buildToolsVersion`
`8`	`9`	`ndkVersion rootProject.ext.ndkVersion`
`@@ -40,12 +41,19 @@ android {`
`40`	`41`	`}`
`41`	`42`	`buildFeatures {`
`42`	`43`	`prefabPublishing true`
	`44`	`+ buildConfig false`
`43`	`45`	`}`
`44`	`46`	`prefab {`
`45`	`47`	`xdl {`
`46`	`48`	`headers "src/main/cpp/include"`
`47`	`49`	`}`
`48`	`50`	`}`
	`51`	`+ publishing {`
	`52`	`+ singleVariant('release') {`
	`53`	`+ withSourcesJar()`
	`54`	`+ withJavadocJar()`
	`55`	`+ }`
	`56`	`+ }`
`49`	`57`	`}`
`50`	`58`
`51`	`59`	`apply from: rootProject.file('gradle/publish.gradle')`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright (c) 2020-2021 HexHacking Team`
	`1`	`+// Copyright (c) 2020-2023 HexHacking Team`
`2`	`2`	`//`
`3`	`3`	`// Permission is hereby granted, free of charge, to any person obtaining a copy`
`4`	`4`	`// of this software and associated documentation files (the "Software"), to deal`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ plugins {`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`android {`
	`6`	`+ namespace 'io.github.hexhacking.xdl.sample'`
`6`	`7`	`compileSdkVersion rootProject.ext.compileSdkVersion`
`7`	`8`	`buildToolsVersion rootProject.ext.buildToolsVersion`
`8`	`9`	`ndkVersion rootProject.ext.ndkVersion`
`@@ -18,9 +19,6 @@ android {`
`18`	`19`	`externalNativeBuild {`
`19`	`20`	`cmake {`
`20`	`21`	`abiFilters rootProject.ext.abiFilters.split(",")`
`21`		`- if (rootProject.ext.dependencyOnLocalLibrary) {`
`22`		`- arguments "-DDEPENDENCY_ON_LOCAL_LIBRARY=ON"`
`23`		`- }`
`24`	`22`	`}`
`25`	`23`	`}`
`26`	`24`	`}`
`@@ -34,8 +32,8 @@ android {`
`34`	`32`	`// }`
`35`	`33`	`}`
`36`	`34`	`compileOptions {`
`37`		`- sourceCompatibility JavaVersion.VERSION_1_8`
`38`		`- targetCompatibility JavaVersion.VERSION_1_8`
	`35`	`+ sourceCompatibility rootProject.ext.javaVersion`
	`36`	`+ targetCompatibility rootProject.ext.javaVersion`
`39`	`37`	`}`
`40`	`38`	`buildTypes {`
`41`	`39`	`debug {`
`@@ -59,14 +57,14 @@ android {`
`59`	`57`	`}`
`60`	`58`
`61`	`59`	`dependencies {`
`62`		`- implementation 'androidx.appcompat:appcompat:1.5.1'`
`63`		`- implementation 'com.google.android.material:material:1.7.0'`
	`60`	`+ implementation 'androidx.appcompat:appcompat:1.6.1'`
	`61`	`+ implementation 'com.google.android.material:material:1.8.0'`
`64`	`62`	`implementation 'androidx.constraintlayout:constraintlayout:2.1.4'`
`65`	`63`
`66`	`64`	`if (rootProject.ext.dependencyOnLocalLibrary) {`
`67`	`65`	`implementation project(':xdl')`
`68`	`66`	`} else {`
`69`		`- implementation 'io.github.hexhacking:xdl:1.2.1'`
	`67`	`+ implementation 'io.github.hexhacking:xdl:' + rootProject.ext.xdlVersion`
`70`	`68`	`}`
`71`	`69`	`}`
`72`	`70`