Skip to content

Commit

Permalink
Add commons-lang as a subproject
Browse files Browse the repository at this point in the history
Avoid using a local version of this apache module
  • Loading branch information
JingMatrix committed Sep 22, 2024
1 parent 5a64b8c commit 6b2ce6c
Show file tree
Hide file tree
Showing 15 changed files with 26 additions and 2,384 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@
[submodule "external/xz-embedded"]
path = external/xz-embedded
url = https://github.com/tukaani-project/xz-embedded
[submodule "apache/commons-lang"]
path = apache/commons-lang
url = https://github.com/apache/commons-lang
16 changes: 16 additions & 0 deletions apache/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
val androidSourceCompatibility: JavaVersion by rootProject.extra
val androidTargetCompatibility: JavaVersion by rootProject.extra

plugins {
id("java-library")
}

java {
sourceCompatibility = androidSourceCompatibility
targetCompatibility = androidTargetCompatibility
sourceSets {
main {
java.srcDirs("commons-lang/src/main/java", "local")
}
}
}
1 change: 1 addition & 0 deletions apache/commons-lang
Submodule commons-lang added at c2cd05
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.commons.lang3.local.reflect;
package org.apache.commons.lang3.reflect;

import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
Expand Down
2 changes: 1 addition & 1 deletion core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ copy {

dependencies {
api(libs.libxposed.api)
implementation(libs.commons.lang3)
implementation(projects.apache)
implementation(projects.axml)
implementation(projects.hiddenapi.bridge)
implementation(projects.services.daemonService)
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/de/robv/android/xposed/XposedHelpers.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import org.apache.commons.lang3.local.ClassUtils;
import org.apache.commons.lang3.local.reflect.MemberUtilsX;
import org.apache.commons.lang3.ClassUtils;
import org.apache.commons.lang3.reflect.MemberUtilsX;

import java.io.ByteArrayOutputStream;
import java.io.FileInputStream;
Expand Down
154 changes: 0 additions & 154 deletions core/src/main/java/org/apache/commons/lang3/local/ArrayUtils.java

This file was deleted.

Loading

0 comments on commit 6b2ce6c

Please sign in to comment.