diff --git a/README.md b/README.md index c55bbe8..4bac6f7 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ } buildscript { dependencies { - classpath 'com.android.tools.build:gradle:3.0.0' + classpath 'com.android.tools.build:gradle:7.2.1' classpath 'com.github.ooftf:autoregister:x.x.x' } } diff --git a/app/build.gradle b/app/build.gradle index 301e9a1..ef65007 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion '26.0.2' + compileSdkVersion 32 + buildToolsVersion '30.0.3' defaultConfig { applicationId "com.billy.android.autoregsiter.demo" minSdkVersion 14 - targetSdkVersion 25 + targetSdkVersion 32 versionCode 1 versionName "1.0" } @@ -17,17 +17,17 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'com.android.support:appcompat-v7:25.0.0' - implementation 'com.android.support.constraint:constraint-layout:1.0.2' + implementation 'com.android.support.constraint:constraint-layout:2.0.4' - compile project(':app_lib') + implementation project(':app_lib') } @@ -74,4 +74,4 @@ project.ext.registerInfoList = [ autoregister { registerInfo = registerInfoList cacheEnabled = true -} \ No newline at end of file +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 55d1bf6..d3fffe1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -9,7 +9,8 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> - + @@ -18,4 +19,4 @@ - \ No newline at end of file + diff --git a/app_lib/build.gradle b/app_lib/build.gradle index 5c858d2..335fa66 100644 --- a/app_lib/build.gradle +++ b/app_lib/build.gradle @@ -1,15 +1,13 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 25 - buildToolsVersion '26.0.2' + compileSdkVersion 32 + buildToolsVersion '30.0.3' defaultConfig { minSdkVersion 14 - targetSdkVersion 25 - versionCode 1 - versionName "1.0" + targetSdkVersion 32 } @@ -24,5 +22,5 @@ android { } dependencies { - compile project(':app_lib_interface') + api project(':app_lib_interface') } diff --git a/app_lib_interface/build.gradle b/app_lib_interface/build.gradle index 7c8d518..5a8e60e 100644 --- a/app_lib_interface/build.gradle +++ b/app_lib_interface/build.gradle @@ -1,15 +1,13 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 25 - buildToolsVersion '26.0.2' + compileSdkVersion 32 + buildToolsVersion '30.0.3' defaultConfig { minSdkVersion 14 - targetSdkVersion 25 - versionCode 1 - versionName "1.0" + targetSdkVersion 32 } diff --git a/autoregister/build.gradle b/autoregister/build.gradle index 6a5005a..8ec332c 100644 --- a/autoregister/build.gradle +++ b/autoregister/build.gradle @@ -9,10 +9,13 @@ repositories { mavenCentral() } publish { - version = '1.4.4'//-snapshot + version = '1.4.5'//-snapshot } dependencies { - implementation 'com.android.tools.build:gradle:4.0.1' + implementation 'com.android.tools.build:gradle:7.2.1' + implementation 'com.google.code.gson:gson:2.9.0' + implementation 'commons-codec:commons-codec:1.15' + implementation 'commons-io:commons-io:2.11.0' } diff --git a/autoregister/src/main/groovy/com/billy/android/register/AutoRegisterHelper.groovy b/autoregister/src/main/groovy/com/billy/android/register/AutoRegisterHelper.groovy index 02c2616..241926c 100644 --- a/autoregister/src/main/groovy/com/billy/android/register/AutoRegisterHelper.groovy +++ b/autoregister/src/main/groovy/com/billy/android/register/AutoRegisterHelper.groovy @@ -5,7 +5,6 @@ import org.gradle.api.Project import java.lang.reflect.Type -import static com.android.builder.model.AndroidProject.FD_INTERMEDIATES /** * 文件操作辅助类 * @author zhangkb @@ -56,7 +55,7 @@ class AutoRegisterHelper { } private static String getCacheFileDir(Project project) { - return project.getBuildDir().absolutePath + File.separator + FD_INTERMEDIATES + File.separator + CACHE_INFO_DIR + File.separator + return project.getBuildDir().absolutePath + File.separator + "intermediates" + File.separator + CACHE_INFO_DIR + File.separator } /** @@ -99,4 +98,4 @@ class AutoRegisterHelper { return isSuccess } -} \ No newline at end of file +} diff --git a/autoregister/src/main/groovy/com/billy/android/register/CodeInsertProcessor.groovy b/autoregister/src/main/groovy/com/billy/android/register/CodeInsertProcessor.groovy index 67d4cd3..6f896fb 100644 --- a/autoregister/src/main/groovy/com/billy/android/register/CodeInsertProcessor.groovy +++ b/autoregister/src/main/groovy/com/billy/android/register/CodeInsertProcessor.groovy @@ -101,7 +101,7 @@ class CodeInsertProcessor { private byte[] doGenerateCode(InputStream inputStream) { ClassReader cr = new ClassReader(inputStream) ClassWriter cw = new ClassWriter(cr, 0) - ClassVisitor cv = new MyClassVisitor(Opcodes.ASM6, cw) + ClassVisitor cv = new MyClassVisitor(Opcodes.ASM9, cw) cr.accept(cv, ClassReader.EXPAND_FRAMES) return cw.toByteArray() } @@ -122,7 +122,7 @@ class CodeInsertProcessor { MethodVisitor mv = super.visitMethod(access, name, desc, signature, exceptions) if (name == extension.initMethodName) { //注入代码到指定的方法之中 boolean _static = (access & Opcodes.ACC_STATIC) > 0 - mv = new MyMethodVisitor(Opcodes.ASM6, mv, _static) + mv = new MyMethodVisitor(Opcodes.ASM9, mv, _static) } return mv } @@ -171,4 +171,4 @@ class CodeInsertProcessor { super.visitMaxs(maxStack + 4, maxLocals) } } -} \ No newline at end of file +} diff --git a/autoregister/src/main/groovy/com/billy/android/register/CodeScanProcessor.groovy b/autoregister/src/main/groovy/com/billy/android/register/CodeScanProcessor.groovy index 15b3342..0da9c57 100644 --- a/autoregister/src/main/groovy/com/billy/android/register/CodeScanProcessor.groovy +++ b/autoregister/src/main/groovy/com/billy/android/register/CodeScanProcessor.groovy @@ -149,7 +149,7 @@ class CodeScanProcessor { boolean scanClass(InputStream inputStream, String filePath) { ClassReader cr = new ClassReader(inputStream) ClassWriter cw = new ClassWriter(cr, 0) - ScanClassVisitor cv = new ScanClassVisitor(Opcodes.ASM6, cw, filePath) + ScanClassVisitor cv = new ScanClassVisitor(Opcodes.ASM9, cw, filePath) cr.accept(cv, ClassReader.EXPAND_FRAMES) inputStream.close() @@ -270,4 +270,4 @@ class CodeScanProcessor { } return false } -} \ No newline at end of file +} diff --git a/build.gradle b/build.gradle index 4223d15..abe974f 100644 --- a/build.gradle +++ b/build.gradle @@ -4,15 +4,19 @@ buildscript { repositories { maven{ url rootProject.file("repo-local") } - maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' } + maven { + url 'http://maven.aliyun.com/nexus/content/groups/public/' + allowInsecureProtocol = true + } google() - jcenter() + mavenCentral() + maven { url "$rootProject.projectDir/mavenLocal" } } dependencies { - classpath 'com.android.tools.build:gradle:4.2.0' + classpath 'com.android.tools.build:gradle:7.2.1' classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4' - classpath 'com.billy.android:autoregister:1.4.2' + classpath 'com.github.ooftf:autoregister:1.4.5' classpath 'com.github.ooftf:ooftf-maven:1.0.4' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -22,7 +26,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 815895c..3a38388 100644 --- 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-6.7.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip diff --git a/mavenLocal/com/github/ooftf/autoregister/1.4.5/autoregister-1.4.5-javadoc.jar b/mavenLocal/com/github/ooftf/autoregister/1.4.5/autoregister-1.4.5-javadoc.jar new file mode 100644 index 0000000..0da25e7 Binary files /dev/null and b/mavenLocal/com/github/ooftf/autoregister/1.4.5/autoregister-1.4.5-javadoc.jar differ diff --git a/mavenLocal/com/github/ooftf/autoregister/1.4.5/autoregister-1.4.5-javadoc.jar.asc b/mavenLocal/com/github/ooftf/autoregister/1.4.5/autoregister-1.4.5-javadoc.jar.asc new file mode 100644 index 0000000..e8cf9c8 --- /dev/null +++ b/mavenLocal/com/github/ooftf/autoregister/1.4.5/autoregister-1.4.5-javadoc.jar.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: BCPG v1.68 + +iQEcBAABCgAGBQJioH3+AAoJEE+lKmWU+S2rWAAIAJGP9e+Wm3mu8q6thnIFM2W5 +ynvmK5++ws2kDQaC7/isZFVuo5w6L5kQUNxwTojILsvYW3y4vX3CQ8dbqwg7JDap +tq7n4yKHDce4YNNetpNGksiiJA/p2l4W9HzxXpRcVSe8eoDEfDg0SIigQJI2hokZ +0lxvg9taRMC2ZB5q4gvLvc2RJp6s8NbHQZ+L8r91grtVCYrqZAcP4aC2xxxklEWh +3AAG5W46ABrz9wtxA2mURNNX1OUw9O4y0SfECSklza63qO1HpPDTTiCCtHB2Y/9X +nDylZF3FNUIk7yrnhdvKl4i1qdH2g8IPjDEeY1wxbZMjciWOKAjJFP1atwNL2ko= +=ZV01 +-----END PGP SIGNATURE----- diff --git a/mavenLocal/com/github/ooftf/autoregister/1.4.5/autoregister-1.4.5-sources.jar b/mavenLocal/com/github/ooftf/autoregister/1.4.5/autoregister-1.4.5-sources.jar new file mode 100644 index 0000000..0796cb3 Binary files /dev/null and b/mavenLocal/com/github/ooftf/autoregister/1.4.5/autoregister-1.4.5-sources.jar differ diff --git a/mavenLocal/com/github/ooftf/autoregister/1.4.5/autoregister-1.4.5-sources.jar.asc b/mavenLocal/com/github/ooftf/autoregister/1.4.5/autoregister-1.4.5-sources.jar.asc new file mode 100644 index 0000000..c7ae951 --- /dev/null +++ b/mavenLocal/com/github/ooftf/autoregister/1.4.5/autoregister-1.4.5-sources.jar.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: BCPG v1.68 + +iQEcBAABCgAGBQJioH3+AAoJEE+lKmWU+S2rKrgIAKszSnJYp8gIhwl0lJ+ljiq7 +piwTp6sCHgoR0mX5QudHO4RegZLw5WjnaMBVtr8xq3G8p5ghba5ya8Iq9qmka7ur +fP3qWuhHinghomKftQbCIB3b8FV20hGNE6E7ZxNx00gKMeiCvzYOU4Md6rMuGOtb +1Vyv0Ip2vlPQkn58bMxFsJvfvfeVk4tjwdHbUhVSGiS2W2Ujx5r28DjFania+CB2 +0ubuvEqchybNNCqUWlP6daTOFX1U8VlhMJJlqJ9QIxYCO0oDE7zOK3Zgbndi1T/W +9RjgrVd03xwxeQWy/vsFd9gY7RhToCnzgOyY40ZImKg0gKh+8ug8+OJGEg7NY6M= +=/u3f +-----END PGP SIGNATURE----- diff --git a/mavenLocal/com/github/ooftf/autoregister/1.4.5/autoregister-1.4.5.jar b/mavenLocal/com/github/ooftf/autoregister/1.4.5/autoregister-1.4.5.jar new file mode 100644 index 0000000..838a256 Binary files /dev/null and b/mavenLocal/com/github/ooftf/autoregister/1.4.5/autoregister-1.4.5.jar differ diff --git a/mavenLocal/com/github/ooftf/autoregister/1.4.5/autoregister-1.4.5.jar.asc b/mavenLocal/com/github/ooftf/autoregister/1.4.5/autoregister-1.4.5.jar.asc new file mode 100644 index 0000000..dd2d4f8 --- /dev/null +++ b/mavenLocal/com/github/ooftf/autoregister/1.4.5/autoregister-1.4.5.jar.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: BCPG v1.68 + +iQEcBAABCgAGBQJioH39AAoJEE+lKmWU+S2rwdoIANV1nMLiTwKZawMbXC21HMCC +5t4KrpZwmQP3lBlIESH+KDIEXuDQsxrboFnLJEST18A1319aj4yBX0xIYWqIHQIc +BaSP9MG3pznrHXhKE5JkPiQGhjbMqaHma15iZgMO0RN+E4q8+LqDRCn8QYxF3g80 ++9xsTEimNO3AX84osCPl7YLoBBFVBKIChhV4rgDPWy8j2GrZWXu6HpTCX26Zgvn3 +1JeLMau0IL0N0mP/eIuxM+FPlptJiVRzcCUPXyWkvIyG9EwYrqVZMhVHwIcd7A9H +tbXvG227rAIfJ8/F3eWhyqAaxT3sZYoJi/ipM8oXYI59xE/zs0lXJHaYNLgPBPk= +=59uT +-----END PGP SIGNATURE----- diff --git a/mavenLocal/com/github/ooftf/autoregister/1.4.5/autoregister-1.4.5.module b/mavenLocal/com/github/ooftf/autoregister/1.4.5/autoregister-1.4.5.module new file mode 100644 index 0000000..214ee97 --- /dev/null +++ b/mavenLocal/com/github/ooftf/autoregister/1.4.5/autoregister-1.4.5.module @@ -0,0 +1,90 @@ +{ + "formatVersion": "1.1", + "component": { + "group": "com.github.ooftf", + "module": "autoregister", + "version": "1.4.5", + "attributes": { + "org.gradle.status": "release" + } + }, + "createdBy": { + "gradle": { + "version": "7.4.2" + } + }, + "variants": [ + { + "name": "apiElements", + "attributes": { + "org.gradle.category": "library", + "org.gradle.dependency.bundling": "external", + "org.gradle.jvm.version": 11, + "org.gradle.libraryelements": "jar", + "org.gradle.usage": "java-api" + }, + "files": [ + { + "name": "autoregister-1.4.5.jar", + "url": "autoregister-1.4.5.jar", + "size": 85746, + "sha512": "26a35e29cf37be339380b4e44ea509972f4e1dc9b1539bbb698548487091daba7015c96a67b8dcab872d041c6d03ff0be5bb91689c772bdf9aeedd3abbde23f5", + "sha256": "d700bd3cc14ddab3cb55a573edde499439953a1fc327f0606521d70b268f929e", + "sha1": "cb959bca03f29fea3b1c31c5c66a2988be08dad0", + "md5": "ab5a473835b176804264bd26b6c3afd2" + } + ] + }, + { + "name": "runtimeElements", + "attributes": { + "org.gradle.category": "library", + "org.gradle.dependency.bundling": "external", + "org.gradle.jvm.version": 11, + "org.gradle.libraryelements": "jar", + "org.gradle.usage": "java-runtime" + }, + "dependencies": [ + { + "group": "com.android.tools.build", + "module": "gradle", + "version": { + "requires": "7.2.1" + } + }, + { + "group": "com.google.code.gson", + "module": "gson", + "version": { + "requires": "2.9.0" + } + }, + { + "group": "commons-codec", + "module": "commons-codec", + "version": { + "requires": "1.15" + } + }, + { + "group": "commons-io", + "module": "commons-io", + "version": { + "requires": "2.11.0" + } + } + ], + "files": [ + { + "name": "autoregister-1.4.5.jar", + "url": "autoregister-1.4.5.jar", + "size": 85746, + "sha512": "26a35e29cf37be339380b4e44ea509972f4e1dc9b1539bbb698548487091daba7015c96a67b8dcab872d041c6d03ff0be5bb91689c772bdf9aeedd3abbde23f5", + "sha256": "d700bd3cc14ddab3cb55a573edde499439953a1fc327f0606521d70b268f929e", + "sha1": "cb959bca03f29fea3b1c31c5c66a2988be08dad0", + "md5": "ab5a473835b176804264bd26b6c3afd2" + } + ] + } + ] +} diff --git a/mavenLocal/com/github/ooftf/autoregister/1.4.5/autoregister-1.4.5.module.asc b/mavenLocal/com/github/ooftf/autoregister/1.4.5/autoregister-1.4.5.module.asc new file mode 100644 index 0000000..07233a6 --- /dev/null +++ b/mavenLocal/com/github/ooftf/autoregister/1.4.5/autoregister-1.4.5.module.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: BCPG v1.68 + +iQEcBAABCgAGBQJioH3+AAoJEE+lKmWU+S2rroIH/Ryl1uhFxAmd3jEtky5vcCM0 +yTrpF6RZSirODCrYEy9i5DmL2gwVvEoEFePhbbxAO7OWs4JcvG5nBcYTGC3tPHH7 +2kHrcyfpqGfyyiL1jOZbX+4FKMg6nfUQVjz6EG4XuOjAscoSawcOx+4FRLfI9rep +8rnKHHD75wybegmG+9HF4ySiotS1+NboZdzBou0TcP/uRNjQPGBZQCIN3i/xWAs9 +pabHfOvSqp07TKyVXRccIRm/nYV7YVdfG3d2ebs4OuBK2k/cnTP97hgOHJ7pkSGU +LbeECq2iyRe0daAqFxjcLhmhd3SIboEm52DmCGW0qOVVb32G6v+ziDQoGni4rOg= +=PuUk +-----END PGP SIGNATURE----- diff --git a/mavenLocal/com/github/ooftf/autoregister/1.4.5/autoregister-1.4.5.pom b/mavenLocal/com/github/ooftf/autoregister/1.4.5/autoregister-1.4.5.pom new file mode 100644 index 0000000..0557f3a --- /dev/null +++ b/mavenLocal/com/github/ooftf/autoregister/1.4.5/autoregister-1.4.5.pom @@ -0,0 +1,60 @@ + + + + + + + + 4.0.0 + com.github.ooftf + autoregister + 1.4.5 + autoregister + noting to description + http://github.com/ooftf/autoregister + + + The Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + ooftf + ooftf + 994749769@qq.com + + + + scm:svn:http://github.com/ooftf + scm:svn:https://github.com/ooftf + http://github.com/ooftf + + + + com.android.tools.build + gradle + 7.2.1 + runtime + + + com.google.code.gson + gson + 2.9.0 + runtime + + + commons-codec + commons-codec + 1.15 + runtime + + + commons-io + commons-io + 2.11.0 + runtime + + + diff --git a/mavenLocal/com/github/ooftf/autoregister/1.4.5/autoregister-1.4.5.pom.asc b/mavenLocal/com/github/ooftf/autoregister/1.4.5/autoregister-1.4.5.pom.asc new file mode 100644 index 0000000..0bf4858 --- /dev/null +++ b/mavenLocal/com/github/ooftf/autoregister/1.4.5/autoregister-1.4.5.pom.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: BCPG v1.68 + +iQEcBAABCgAGBQJioH39AAoJEE+lKmWU+S2rm3cH/1972ri2XgANk0ttUJi4M7Aw +U5/rqFNkgs2zC0sbh2zysD67sg0HOfQLBWUU3C+4grSLVAtZckUdSIFaNO/rBeDm +4fiusxdroHrc64gTLJyN8xcub2a7gAhqsBbfFqhGdjUpv+KJA+B4HlckB3oxUtLV +qz/hREOvnni5EY9OFviYE32Kjqpbnk/EU7ieaGhPivAIIkMSxAvZX9UHPRS6/yY3 +oVvjNhZbjlvAhIYh3Et6O7U5VEV3POwpou53Hg0xy4rGlnz3EYZ0MZX+Stbag2I9 +p3YOmNgE/4l9h/a/L4Uc5DYgnRLVzyZcpWx9HZkWx6VDj3S52RiFVSUdiE1tYqU= +=mFWm +-----END PGP SIGNATURE----- diff --git a/mavenLocal/com/github/ooftf/autoregister/maven-metadata-local.xml b/mavenLocal/com/github/ooftf/autoregister/maven-metadata-local.xml new file mode 100644 index 0000000..7c79107 --- /dev/null +++ b/mavenLocal/com/github/ooftf/autoregister/maven-metadata-local.xml @@ -0,0 +1,14 @@ + + + com.github.ooftf + autoregister + + 1.4.5 + 1.4.5 + + 1.4.4 + 1.4.5 + + 20220608104622 + +