Restructure library modules

terminal/ -> terminal-emulator/ view/ -> terminal-view/
thewisenerd · Apr 2, 2017 · 7d3a988 · 7d3a988
1 parent 5cd705d
commit 7d3a988
Show file tree

Hide file tree

Showing 54 changed files with 15 additions and 10 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/LICENSE.md b/LICENSE.md
@@ -0,0 +1,3 @@
+Released under [the GPLv3 license](https://www.gnu.org/licenses/gpl.html).
+
+Contains code from `Terminal Emulator for Android` by which is released under [the Apache License 2.0](https://www.apache.org/licenses/).
diff --git a/README.md b/README.md
@@ -12,10 +12,6 @@ Termux app
 
 Note that this repository is for the app itself (the user interface and the terminal emulation). For the packages installable inside the app, see [termux/termux-packages](https://github.com/termux/termux-packages)
 
-License
-=======
-Released under [the GPLv3 license](https://www.gnu.org/licenses/gpl.html). Contains code from `Terminal Emulator for Android` which is released under [the Apache License 2.0](https://www.apache.org/licenses/).
-
 Terminal resources
 ==================
 * [XTerm control sequences](http://invisible-island.net/xterm/ctlseqs/ctlseqs.html)

diff --git a/app/build.gradle b/app/build.gradle
@@ -7,7 +7,7 @@ android {
     dependencies {
         compile 'com.android.support:support-annotations:25.3.1'
         compile "com.android.support:support-v4:25.3.1"
-        compile project(":view")
+        compile project(":terminal-view")
     }
 
     defaultConfig {

diff --git a/float/build.gradle b/float/build.gradle
@@ -6,7 +6,7 @@ android {
 
     dependencies {
         compile 'com.android.support:support-annotations:25.3.1'
-        compile project(":view")
+        compile project(":terminal-view")
     }
 
     defaultConfig {

diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include ':app', ':terminal', ':view', ':float'
+include ':app', ':terminal-emulator', ':terminal-view', ':float'
diff --git a/terminal/build.gradle → terminal-emulator/build.gradle b/terminal/build.gradle → terminal-emulator/build.gradle
@@ -33,6 +33,12 @@ android {
     }
 }
 
+tasks.withType(Test) {
+    testLogging {
+        events "started", "passed", "skipped", "failed"
+    }
+}
+
 dependencies {
     testCompile 'junit:junit:4.12'
 }
diff --git a/terminal/proguard-rules.pro → terminal-emulator/proguard-rules.pro b/terminal/proguard-rules.pro → terminal-emulator/proguard-rules.pro
diff --git a/terminal/src/main/AndroidManifest.xml → ...nal-emulator/src/main/AndroidManifest.xml b/terminal/src/main/AndroidManifest.xml → ...nal-emulator/src/main/AndroidManifest.xml
diff --git a/...n/java/com/termux/terminal/ByteQueue.java → ...n/java/com/termux/terminal/ByteQueue.java b/...n/java/com/termux/terminal/ByteQueue.java → ...n/java/com/termux/terminal/ByteQueue.java
diff --git a/...va/com/termux/terminal/EmulatorDebug.java → ...va/com/termux/terminal/EmulatorDebug.java b/...va/com/termux/terminal/EmulatorDebug.java → ...va/com/termux/terminal/EmulatorDebug.java
diff --git a/...rc/main/java/com/termux/terminal/JNI.java → ...rc/main/java/com/termux/terminal/JNI.java b/...rc/main/java/com/termux/terminal/JNI.java → ...rc/main/java/com/termux/terminal/JNI.java
diff --git a/.../java/com/termux/terminal/KeyHandler.java → .../java/com/termux/terminal/KeyHandler.java b/.../java/com/termux/terminal/KeyHandler.java → .../java/com/termux/terminal/KeyHandler.java
diff --git a/...a/com/termux/terminal/TerminalBuffer.java → ...a/com/termux/terminal/TerminalBuffer.java b/...a/com/termux/terminal/TerminalBuffer.java → ...a/com/termux/terminal/TerminalBuffer.java
diff --git a/.../termux/terminal/TerminalColorScheme.java → .../termux/terminal/TerminalColorScheme.java b/.../termux/terminal/TerminalColorScheme.java → .../termux/terminal/TerminalColorScheme.java
diff --git a/...a/com/termux/terminal/TerminalColors.java → ...a/com/termux/terminal/TerminalColors.java b/...a/com/termux/terminal/TerminalColors.java → ...a/com/termux/terminal/TerminalColors.java
diff --git a/...com/termux/terminal/TerminalEmulator.java → ...com/termux/terminal/TerminalEmulator.java b/...com/termux/terminal/TerminalEmulator.java → ...com/termux/terminal/TerminalEmulator.java
diff --git a/...a/com/termux/terminal/TerminalOutput.java → ...a/com/termux/terminal/TerminalOutput.java b/...a/com/termux/terminal/TerminalOutput.java → ...a/com/termux/terminal/TerminalOutput.java
diff --git a/...java/com/termux/terminal/TerminalRow.java → ...java/com/termux/terminal/TerminalRow.java b/...java/com/termux/terminal/TerminalRow.java → ...java/com/termux/terminal/TerminalRow.java
diff --git a/.../com/termux/terminal/TerminalSession.java → .../com/termux/terminal/TerminalSession.java b/.../com/termux/terminal/TerminalSession.java → .../com/termux/terminal/TerminalSession.java
diff --git a/...n/java/com/termux/terminal/TextStyle.java → ...n/java/com/termux/terminal/TextStyle.java b/...n/java/com/termux/terminal/TextStyle.java → ...n/java/com/termux/terminal/TextStyle.java
diff --git a/...ain/java/com/termux/terminal/WcWidth.java → ...ain/java/com/termux/terminal/WcWidth.java b/...ain/java/com/termux/terminal/WcWidth.java → ...ain/java/com/termux/terminal/WcWidth.java
diff --git a/terminal/src/main/jni/Android.mk → terminal-emulator/src/main/jni/Android.mk b/terminal/src/main/jni/Android.mk → terminal-emulator/src/main/jni/Android.mk
diff --git a/terminal/src/main/jni/termux.c → terminal-emulator/src/main/jni/termux.c b/terminal/src/main/jni/termux.c → terminal-emulator/src/main/jni/termux.c
diff --git a/...va/com/termux/terminal/ByteQueueTest.java → ...va/com/termux/terminal/ByteQueueTest.java b/...va/com/termux/terminal/ByteQueueTest.java → ...va/com/termux/terminal/ByteQueueTest.java
diff --git a/...rminal/ControlSequenceIntroducerTest.java → ...rminal/ControlSequenceIntroducerTest.java b/...rminal/ControlSequenceIntroducerTest.java → ...rminal/ControlSequenceIntroducerTest.java
diff --git a/.../termux/terminal/CursorAndScreenTest.java → .../termux/terminal/CursorAndScreenTest.java b/.../termux/terminal/CursorAndScreenTest.java → .../termux/terminal/CursorAndScreenTest.java
diff --git a/.../java/com/termux/terminal/DecSetTest.java → .../java/com/termux/terminal/DecSetTest.java b/.../java/com/termux/terminal/DecSetTest.java → .../java/com/termux/terminal/DecSetTest.java
diff --git a/...mux/terminal/DeviceControlStringTest.java → ...mux/terminal/DeviceControlStringTest.java b/...mux/terminal/DeviceControlStringTest.java → ...mux/terminal/DeviceControlStringTest.java
diff --git a/...java/com/termux/terminal/HistoryTest.java → ...java/com/termux/terminal/HistoryTest.java b/...java/com/termux/terminal/HistoryTest.java → ...java/com/termux/terminal/HistoryTest.java
diff --git a/...a/com/termux/terminal/KeyHandlerTest.java → ...a/com/termux/terminal/KeyHandlerTest.java b/...a/com/termux/terminal/KeyHandlerTest.java → ...a/com/termux/terminal/KeyHandlerTest.java
diff --git a/.../terminal/OperatingSystemControlTest.java → .../terminal/OperatingSystemControlTest.java b/.../terminal/OperatingSystemControlTest.java → .../terminal/OperatingSystemControlTest.java
diff --git a/...termux/terminal/RectangularAreasTest.java → ...termux/terminal/RectangularAreasTest.java b/...termux/terminal/RectangularAreasTest.java → ...termux/terminal/RectangularAreasTest.java
diff --git a/.../java/com/termux/terminal/ResizeTest.java → .../java/com/termux/terminal/ResizeTest.java b/.../java/com/termux/terminal/ResizeTest.java → .../java/com/termux/terminal/ResizeTest.java
diff --git a/...com/termux/terminal/ScreenBufferTest.java → ...com/termux/terminal/ScreenBufferTest.java b/...com/termux/terminal/ScreenBufferTest.java → ...com/termux/terminal/ScreenBufferTest.java
diff --git a/...com/termux/terminal/ScrollRegionTest.java → ...com/termux/terminal/ScrollRegionTest.java b/...com/termux/terminal/ScrollRegionTest.java → ...com/termux/terminal/ScrollRegionTest.java
diff --git a/.../com/termux/terminal/TerminalRowTest.java → .../com/termux/terminal/TerminalRowTest.java b/.../com/termux/terminal/TerminalRowTest.java → .../com/termux/terminal/TerminalRowTest.java
diff --git a/...ava/com/termux/terminal/TerminalTest.java → ...ava/com/termux/terminal/TerminalTest.java b/...ava/com/termux/terminal/TerminalTest.java → ...ava/com/termux/terminal/TerminalTest.java
diff --git a/...com/termux/terminal/TerminalTestCase.java → ...com/termux/terminal/TerminalTestCase.java b/...com/termux/terminal/TerminalTestCase.java → ...com/termux/terminal/TerminalTestCase.java
diff --git a/...va/com/termux/terminal/TextStyleTest.java → ...va/com/termux/terminal/TextStyleTest.java b/...va/com/termux/terminal/TextStyleTest.java → ...va/com/termux/terminal/TextStyleTest.java
diff --git a/...com/termux/terminal/UnicodeInputTest.java → ...com/termux/terminal/UnicodeInputTest.java b/...com/termux/terminal/UnicodeInputTest.java → ...com/termux/terminal/UnicodeInputTest.java
diff --git a/...java/com/termux/terminal/WcWidthTest.java → ...java/com/termux/terminal/WcWidthTest.java b/...java/com/termux/terminal/WcWidthTest.java → ...java/com/termux/terminal/WcWidthTest.java
diff --git a/view/build.gradle → terminal-view/build.gradle b/view/build.gradle → terminal-view/build.gradle
@@ -6,7 +6,7 @@ android {
 
     dependencies {
         compile 'com.android.support:support-annotations:25.3.1'
-        compile project(":terminal")
+        compile project(":terminal-emulator")
     }
 
     defaultConfig {

diff --git a/view/proguard-rules.pro → terminal-view/proguard-rules.pro b/view/proguard-rules.pro → terminal-view/proguard-rules.pro
diff --git a/view/src/main/AndroidManifest.xml → terminal-view/src/main/AndroidManifest.xml b/view/src/main/AndroidManifest.xml → terminal-view/src/main/AndroidManifest.xml
diff --git a/...ermux/view/GestureAndScaleRecognizer.java → ...ermux/view/GestureAndScaleRecognizer.java b/...ermux/view/GestureAndScaleRecognizer.java → ...ermux/view/GestureAndScaleRecognizer.java
diff --git a/.../com/termux/view/TerminalKeyListener.java → .../com/termux/view/TerminalKeyListener.java b/.../com/termux/view/TerminalKeyListener.java → .../com/termux/view/TerminalKeyListener.java
diff --git a/...ava/com/termux/view/TerminalRenderer.java → ...ava/com/termux/view/TerminalRenderer.java b/...ava/com/termux/view/TerminalRenderer.java → ...ava/com/termux/view/TerminalRenderer.java
diff --git a/...in/java/com/termux/view/TerminalView.java → ...in/java/com/termux/view/TerminalView.java b/...in/java/com/termux/view/TerminalView.java → ...in/java/com/termux/view/TerminalView.java
diff --git a/...pi/text_select_handle_left_mtrl_alpha.png → ...pi/text_select_handle_left_mtrl_alpha.png b/...pi/text_select_handle_left_mtrl_alpha.png → ...pi/text_select_handle_left_mtrl_alpha.png
diff --git a/...i/text_select_handle_right_mtrl_alpha.png → ...i/text_select_handle_right_mtrl_alpha.png b/...i/text_select_handle_right_mtrl_alpha.png → ...i/text_select_handle_right_mtrl_alpha.png
diff --git a/...able/text_select_handle_left_material.xml → ...able/text_select_handle_left_material.xml b/...able/text_select_handle_left_material.xml → ...able/text_select_handle_left_material.xml
diff --git a/...ble/text_select_handle_right_material.xml → ...ble/text_select_handle_right_material.xml b/...ble/text_select_handle_right_material.xml → ...ble/text_select_handle_right_material.xml
diff --git a/view/src/main/res/values/strings.xml → ...inal-view/src/main/res/values/strings.xml b/view/src/main/res/values/strings.xml → ...inal-view/src/main/res/values/strings.xml
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		Released under [the GPLv3 license](https://www.gnu.org/licenses/gpl.html).

		Contains code from `Terminal Emulator for Android` by which is released under [the Apache License 2.0](https://www.apache.org/licenses/).
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		include ':app', ':terminal', ':view', ':float'
		include ':app', ':terminal-emulator', ':terminal-view', ':float'