Bump gradle dependencies

Bump version to 0.61
Use lower when looking up mime type from extension
2018-06-15 00:22:52 +02:00 · 2018-06-15 00:21:27 +02:00 · 2018-06-15 00:19:47 +02:00 · 2018-06-14 23:58:41 +02:00 · 2018-06-13 22:45:37 +02:00 · 2018-06-13 22:45:37 +02:00
11 changed files with 17 additions and 17 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,8 @@ local.properties
 .idea/scopes/scope_settings.xml
 .idea/vcs.xml
 .idea/dictionaries/
+.idea/caches/
+.idea/codeStyles/
 *.iml

 # OS-specific files
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ android:
  components:
    - platform-tools
    - tools
-    - build-tools-27.0.2
+    - build-tools-27.0.3
    - android-27
    - extra-android-m2repository

--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,11 +2,10 @@ apply plugin: 'com.android.application'

 android {
    compileSdkVersion 27
-    buildToolsVersion "27.0.2"

    dependencies {
-        implementation 'com.android.support:support-annotations:27.0.2'
-        implementation "com.android.support:support-core-ui:27.0.2"
+        implementation 'com.android.support:support-annotations:27.1.1'
+        implementation "com.android.support:support-core-ui:27.1.1"
        implementation project(":terminal-view")
    }

@@ -14,8 +13,8 @@ android {
        applicationId "com.termux"
        minSdkVersion 21
        targetSdkVersion 27
-        versionCode 60
-        versionName "0.60"
+        versionCode 61
+        versionName "0.61"
    }

    buildTypes {
--- a/app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java
+++ b/app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java
@@ -195,7 +195,7 @@ public class TermuxDocumentsProvider extends DocumentsProvider {
            final String name = file.getName();
            final int lastDot = name.lastIndexOf('.');
            if (lastDot >= 0) {
-                final String extension = name.substring(lastDot + 1);
+                final String extension = name.substring(lastDot + 1).toLowerCase();
                final String mime = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension);
                if (mime != null) return mime;
            }
--- a/build.gradle
+++ b/build.gradle
@@ -4,16 +4,14 @@ buildscript {
        google()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.3'
    }
 }

 allprojects {
    repositories {
+        google()
        jcenter()
-        maven {
-            url "https://maven.google.com"
-        }
    }
 }

--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
--- a/terminal-emulator/build.gradle
+++ b/terminal-emulator/build.gradle
@@ -18,7 +18,6 @@ ext {

 android {
    compileSdkVersion 27
-    buildToolsVersion "27.0.2"

    defaultConfig {
        minSdkVersion 21
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
@@ -2338,6 +2338,9 @@ public final class TerminalEmulator {
    public void paste(String text) {
        // First: Always remove escape key and C1 control characters [0x80,0x9F]:
        text = text.replaceAll("(\u001B|[\u0080-\u009F])", "");
+        // Second: Replace all newlines (\n) or CRLF (\r\n) with carriage returns (\r).
+        text = text.replaceAll("\r?\n", "\r");
+
        // Then: Implement bracketed paste mode if enabled:
        boolean bracketed = isDecsetInternalBitSet(DECSET_BIT_BRACKETED_PASTE_MODE);
        if (bracketed) mSession.write("\033[200~");
--- a/terminal-view/build.gradle
+++ b/terminal-view/build.gradle
@@ -18,10 +18,9 @@ ext {

 android {
    compileSdkVersion 27
-    buildToolsVersion "27.0.2"

    dependencies {
-        implementation 'com.android.support:support-annotations:27.0.0'
+        implementation 'com.android.support:support-annotations:27.1.1'
        api project(":terminal-emulator")
    }

--- a/terminal-view/src/main/java/com/termux/view/TerminalRenderer.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalRenderer.java
@@ -16,7 +16,7 @@ import com.termux.terminal.WcWidth;
 * <p/>
 * Saves font metrics, so needs to be recreated each time the typeface or font size changes.
 */
-final class TerminalRenderer {
+public final class TerminalRenderer {

    final int mTextSize;
    final Typeface mTypeface;
Author	SHA1	Message	Date
Fredrik Fornwall	17c4a45212	Bump gradle dependencies	2018-06-15 00:22:52 +02:00
Fredrik Fornwall	6d9ffb6922	Bump version to 0.61	2018-06-15 00:21:27 +02:00
Fredrik Fornwall	8472fce8ba	Use lower when looking up mime type from extension Fixes #721.	2018-06-15 00:19:47 +02:00
Fredrik Fornwall	69d954a583	Update gradle configuration	2018-06-14 23:58:41 +02:00
easyaspi314 (Devin)	ec1087d56f	Replace CRLF with CR as well. This should replace both \r\n and \n with \r now. "\r?\n" matches 0 or 1 \r and one \n, which should capture both escape sequences.	2018-06-13 22:45:37 +02:00
easyaspi314 (Devin)	be6a73d862	Replace \n with \r when pasting (Fixes #678 ) Termux will now properly send \r to the terminal instead of \n when pasting multiline strings. This fixes cat not repeating back lines and nano accidentally justifying text (because \n maps to ^J), as well as other potential issues. This matches the behavior of other terminals, such as iTerm2 which explicitly does it here: https://github.com/gnachman/iTerm2/blob/f8a5930/sources/iTermPasteHelper.m#L113 Signed-off-by: easyaspi314 (Devin) <easyaspi314@users.noreply.github.com>	2018-06-13 22:45:37 +02:00
l-jonas	80c81b274d	Update build.gradle	2018-06-11 12:26:35 +02:00
Jonas L	cd9dbac548	Add Google Repository The Google-Repository is required for compilation because some dependencies were removed from jcenter()	2018-06-11 12:26:35 +02:00
Fredrik Fornwall	0c837796f0	Update Android plugin for Gradle	2018-06-11 12:23:52 +02:00
Fredrik Fornwall	3417e37e8d	Update gitignore for Android Studio 3.1	2018-04-02 01:38:47 +02:00
Fredrik Fornwall	31ba36e0fa	Remove explicit buildToolsVersion https://developer.android.com/studio/releases/gradle-plugin.html#behavior_changes	2018-04-02 00:58:02 +02:00
Fredrik Fornwall	c444f1fd28	Update gradle configuration	2018-04-02 00:40:16 +02:00
RangerMauve	9f36ed06b8	Make TerminalRenderer public I want to use the renderer with a custom canvas without having to render to an Android View which requires a context and all sorts of stuff. Can't currently do that because the renderer is package-private	2018-03-10 22:55:10 +01:00
Fredrik Fornwall	c2ab5bcd50	Bump some dependency versions	2018-02-06 23:30:28 +01:00