From 62a49eced1b188f6ba346219ab9e121068eae85a Mon Sep 17 00:00:00 2001 From: dxl <64101226@qq.com> Date: Fri, 23 Oct 2020 15:12:09 +0800 Subject: [PATCH] Delete xmodem module. --- app_main/build.gradle | 1 - .../chameleon/ChameleonGUIActivity.java | 2 +- .../rrg/chameleon}/xmodem/AbstractXModem.java | 2 +- .../cn/rrg/chameleon}/xmodem/XModem1024.java | 2 +- .../cn/rrg/chameleon}/xmodem/XModem128.java | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +-- settings.gradle | 3 +- xmodem/.gitignore | 1 - xmodem/build.gradle | 33 ------------------- xmodem/consumer-rules.pro | 0 xmodem/proguard-rules.pro | 21 ------------ .../xmodem/ExampleInstrumentedTest.java | 27 --------------- xmodem/src/main/AndroidManifest.xml | 2 -- .../com/proxgrind/xmodem/ExampleUnitTest.java | 17 ---------- 14 files changed, 7 insertions(+), 110 deletions(-) rename {xmodem/src/main/java/com/proxgrind => chameleon/src/main/java/cn/rrg/chameleon}/xmodem/AbstractXModem.java (98%) rename {xmodem/src/main/java/com/proxgrind => chameleon/src/main/java/cn/rrg/chameleon}/xmodem/XModem1024.java (93%) rename {xmodem/src/main/java/com/proxgrind => chameleon/src/main/java/cn/rrg/chameleon}/xmodem/XModem128.java (99%) delete mode 100644 xmodem/.gitignore delete mode 100644 xmodem/build.gradle delete mode 100644 xmodem/consumer-rules.pro delete mode 100644 xmodem/proguard-rules.pro delete mode 100644 xmodem/src/androidTest/java/com/proxgrind/xmodem/ExampleInstrumentedTest.java delete mode 100644 xmodem/src/main/AndroidManifest.xml delete mode 100644 xmodem/src/test/java/com/proxgrind/xmodem/ExampleUnitTest.java diff --git a/app_main/build.gradle b/app_main/build.gradle index d79e7afb..e611ce50 100644 --- a/app_main/build.gradle +++ b/app_main/build.gradle @@ -68,7 +68,6 @@ dependencies { implementation project(path: ':pm3flasher') implementation project(':pm3rdv4rrg') - implementation project(path: ':xmodem') // The dep from TERMUX(A FullTerminal implements.) implementation project(":termux-app") diff --git a/app_main/src/main/java/cn/rrg/rdv/activities/chameleon/ChameleonGUIActivity.java b/app_main/src/main/java/cn/rrg/rdv/activities/chameleon/ChameleonGUIActivity.java index d6907cd6..512ce7b8 100644 --- a/app_main/src/main/java/cn/rrg/rdv/activities/chameleon/ChameleonGUIActivity.java +++ b/app_main/src/main/java/cn/rrg/rdv/activities/chameleon/ChameleonGUIActivity.java @@ -18,7 +18,7 @@ import android.widget.ListView; import android.widget.TextView; import com.iobridges.com.Communication; -import com.proxgrind.xmodem.XModem128; +import cn.rrg.chameleon.xmodem.XModem128; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/xmodem/src/main/java/com/proxgrind/xmodem/AbstractXModem.java b/chameleon/src/main/java/cn/rrg/chameleon/xmodem/AbstractXModem.java similarity index 98% rename from xmodem/src/main/java/com/proxgrind/xmodem/AbstractXModem.java rename to chameleon/src/main/java/cn/rrg/chameleon/xmodem/AbstractXModem.java index a8a3c06f..1f0a0370 100644 --- a/xmodem/src/main/java/com/proxgrind/xmodem/AbstractXModem.java +++ b/chameleon/src/main/java/cn/rrg/chameleon/xmodem/AbstractXModem.java @@ -1,4 +1,4 @@ -package com.proxgrind.xmodem; +package cn.rrg.chameleon.xmodem; import java.io.IOException; import java.io.InputStream; diff --git a/xmodem/src/main/java/com/proxgrind/xmodem/XModem1024.java b/chameleon/src/main/java/cn/rrg/chameleon/xmodem/XModem1024.java similarity index 93% rename from xmodem/src/main/java/com/proxgrind/xmodem/XModem1024.java rename to chameleon/src/main/java/cn/rrg/chameleon/xmodem/XModem1024.java index f6d8f312..15dd8457 100644 --- a/xmodem/src/main/java/com/proxgrind/xmodem/XModem1024.java +++ b/chameleon/src/main/java/cn/rrg/chameleon/xmodem/XModem1024.java @@ -1,4 +1,4 @@ -package com.proxgrind.xmodem; +package cn.rrg.chameleon.xmodem; import java.io.IOException; import java.io.InputStream; diff --git a/xmodem/src/main/java/com/proxgrind/xmodem/XModem128.java b/chameleon/src/main/java/cn/rrg/chameleon/xmodem/XModem128.java similarity index 99% rename from xmodem/src/main/java/com/proxgrind/xmodem/XModem128.java rename to chameleon/src/main/java/cn/rrg/chameleon/xmodem/XModem128.java index 32fe107d..8aec876b 100644 --- a/xmodem/src/main/java/com/proxgrind/xmodem/XModem128.java +++ b/chameleon/src/main/java/cn/rrg/chameleon/xmodem/XModem128.java @@ -1,4 +1,4 @@ -package com.proxgrind.xmodem; +package cn.rrg.chameleon.xmodem; import java.io.IOException; import java.io.InputStream; diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9a72a8ce..68a5564b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Oct 23 14:41:30 CST 2020 +#Fri Oct 23 15:04:20 CST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip diff --git a/settings.gradle b/settings.gradle index 61d556df..6984df2c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,3 @@ include ':app_main', ':chameleon', ':communication', ':libnfc_pn53x' -include ':pm3flasher', ':pm3rdv4rrg' -include ':xmodem', ':utils' +include ':pm3flasher', ':pm3rdv4rrg',':utils' include ':termux-app', ':terminal-emulator', ':terminal-view' \ No newline at end of file diff --git a/xmodem/.gitignore b/xmodem/.gitignore deleted file mode 100644 index 796b96d1..00000000 --- a/xmodem/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/xmodem/build.gradle b/xmodem/build.gradle deleted file mode 100644 index 631889a0..00000000 --- a/xmodem/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.library' - -android { - compileSdkVersion 29 - buildToolsVersion "29.0.3" - - defaultConfig { - minSdkVersion 19 - targetSdkVersion 29 - versionCode 1 - versionName "1.0" - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles 'consumer-rules.pro' - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } - -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - - implementation 'androidx.appcompat:appcompat:1.1.0' - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test.ext:junit:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' -} diff --git a/xmodem/consumer-rules.pro b/xmodem/consumer-rules.pro deleted file mode 100644 index e69de29b..00000000 diff --git a/xmodem/proguard-rules.pro b/xmodem/proguard-rules.pro deleted file mode 100644 index f1b42451..00000000 --- a/xmodem/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/xmodem/src/androidTest/java/com/proxgrind/xmodem/ExampleInstrumentedTest.java b/xmodem/src/androidTest/java/com/proxgrind/xmodem/ExampleInstrumentedTest.java deleted file mode 100644 index 3effb2cd..00000000 --- a/xmodem/src/androidTest/java/com/proxgrind/xmodem/ExampleInstrumentedTest.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.proxgrind.xmodem; - -import android.content.Context; - -import androidx.test.platform.app.InstrumentationRegistry; -import androidx.test.ext.junit.runners.AndroidJUnit4; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import static org.junit.Assert.*; - -/** - * Instrumented test, which will execute on an Android device. - * - * @see Testing documentation - */ -@RunWith(AndroidJUnit4.class) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); - - assertEquals("com.proxgrind.xmodem.test", appContext.getPackageName()); - } -} diff --git a/xmodem/src/main/AndroidManifest.xml b/xmodem/src/main/AndroidManifest.xml deleted file mode 100644 index 3514a0eb..00000000 --- a/xmodem/src/main/AndroidManifest.xml +++ /dev/null @@ -1,2 +0,0 @@ - diff --git a/xmodem/src/test/java/com/proxgrind/xmodem/ExampleUnitTest.java b/xmodem/src/test/java/com/proxgrind/xmodem/ExampleUnitTest.java deleted file mode 100644 index 91313efb..00000000 --- a/xmodem/src/test/java/com/proxgrind/xmodem/ExampleUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.proxgrind.xmodem; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() { - assertEquals(4, 2 + 2); - } -} \ No newline at end of file