Merge pull request #1 from AnySoftKeyboard/master

Merging from upstream
andalugeeks · Aug 19, 2024 · 58c5d0a · 58c5d0a
2 parents 9cc51e6 + 87e4c88
commit 58c5d0a
Show file tree

Hide file tree

Showing 20 changed files with 92 additions and 69 deletions.
diff --git a/README.md b/README.md
@@ -1,3 +1,6 @@
+# deprecated
+This repository was merged into the main [repository](https://github.com/AnySoftKeyboard/AnySoftKeyboard/tree/master/addons/languages).
+
 # AnySoftKeyboard Add-On Packs
 `master` latest build: [![CircleCI](https://circleci.com/gh/AnySoftKeyboard/LanguagePack/tree/master.svg?style=svg)](https://circleci.com/gh/AnySoftKeyboard/LanguagePack/tree/master)<br/>
 <br/>

diff --git a/api/build.gradle b/api/build.gradle
@@ -3,9 +3,9 @@ group = 'com.anysoftkeyboard'
 apply plugin: 'com.android.library'
 
 apply from: "$rootDir/gradle/all_android.gradle"
-apply from: "$rootDir/gradle/publish_maven.gradle"
-
-publish {
-    artifactId = 'api'
-    desc = "API library for AnySoftKeyboard add-ons"
-}
+//apply from: "$rootDir/gradle/publish_maven.gradle"
+//
+//publish {
+//    artifactId = 'api'
+//    desc = "API library for AnySoftKeyboard add-ons"
+//}
diff --git a/base/build.gradle b/base/build.gradle
@@ -3,9 +3,9 @@ group = 'com.anysoftkeyboard'
 apply plugin: 'com.android.library'
 
 apply from: "$rootDir/gradle/all_android.gradle"
-apply from: "$rootDir/gradle/publish_maven.gradle"
-
-publish {
-    artifactId = 'base'
-    desc = "Base library for AnySoftKeyboard packs"
-}
+//apply from: "$rootDir/gradle/publish_maven.gradle"
+//
+//publish {
+//    artifactId = 'base'
+//    desc = "Base library for AnySoftKeyboard packs"
+//}
diff --git a/build.gradle b/build.gradle
@@ -9,12 +9,12 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
+        classpath 'com.android.tools.build:gradle:3.5.3'
         classpath 'net.evendanan.autoversion:gradle-plugin:0.2.2'
 
         classpath 'com.github.triplet.gradle:play-publisher:2.4.2'
-
-        classpath 'com.novoda:bintray-release:0.9.1'
+        //not compatible with gradle 6+
+        //classpath 'com.novoda:bintray-release:0.9.1'
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -18,4 +18,6 @@
 org.gradle.parallel=false
 org.gradle.jvmargs=-Xms740m -Xmx800m -Dfile.encoding=UTF-8
 org.gradle.configureondemand=false
-org.gradle.caching=true
+org.gradle.caching=true
+android.enableUnitTestBinaryResources=false
+android.testConfig.useRelativePath=true
diff --git a/gradle/all_android.gradle b/gradle/all_android.gradle
@@ -25,7 +25,26 @@ android {
         noCompress ''
     }
 
-    testOptions.unitTests.includeAndroidResources true
+    testOptions {
+        unitTests {
+            includeAndroidResources = true
+
+            all {
+                testLogging {
+                    showCauses true
+                    showExceptions true
+                    showStackTraces true
+                }
+
+                systemProperty 'java.awt.headless', true
+                systemProperty 'robolectric.logging', 'stdout'
+                //disabling since there is just too much logging happening in the Robolectric layer.
+                systemProperty 'robolectric.logging.enabled', false
+
+                systemProperty 'robolectric.dependency.repo.url', 'https://repo1.maven.org/maven2'
+            }
+        }
+    }
 }
 
 apply from: "$rootDir/gradle/versioning_add_on.gradle"
@@ -34,13 +53,14 @@ dependencies {
     repositories {
         google()
         jcenter()
+        maven { url 'https://repo1.maven.org/maven2' /*maven-central with HTTPS*/}
         maven { url "https://jitpack.io" }
     }
 
     if (path != ':api') {
         api project(path: ':api')
     }
 
-    testImplementation 'org.robolectric:robolectric:4.3'
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.robolectric:robolectric:4.3.1'
+    testImplementation 'junit:junit:4.13'
 }
diff --git a/gradle/publish_maven.gradle b/gradle/publish_maven.gradle
@@ -1,15 +1,16 @@
-apply plugin: 'com.novoda.bintray-release'
-
-publish {
-    userOrg = 'anysoftkeyboard'
-    repoName = 'AnySoftKeyboard'
-    groupId = group
-    publishVersion = version
-    website = "https://github.com/AnySoftKeyboard/LanguagePack/${projectDir}"
-    licences = ['Apache-2.0']
-    issueTracker = 'https://github.com/AnySoftKeyboard/LanguagePack/issues'
-    autoPublish = true
-
-    bintrayUser = 'menny'
-    bintrayKey = System.getenv('BINTRAY_API_KEY')
-}
+//not compatible with gradle 6+
+//apply plugin: 'com.novoda.bintray-release'
+//
+//publish {
+//    userOrg = 'anysoftkeyboard'
+//    repoName = 'AnySoftKeyboard'
+//    groupId = group
+//    publishVersion = version
+//    website = "https://github.com/AnySoftKeyboard/LanguagePack/${projectDir}"
+//    licences = ['Apache-2.0']
+//    issueTracker = 'https://github.com/AnySoftKeyboard/LanguagePack/issues'
+//    autoPublish = true
+//
+//    bintrayUser = 'menny'
+//    bintrayKey = System.getenv('BINTRAY_API_KEY')
+//}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -125,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
@@ -154,19 +154,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +175,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"
diff --git a/languages/english/pack/build.gradle b/languages/english/pack/build.gradle
@@ -4,9 +4,9 @@ ext.dictionaryInputPossibleCharacters = null//"".toCharArray()
 ext.dictionaryInputAdditionalInnerCharacters = null//"".toCharArray()
 
 apply from: "$rootDir/gradle/language_pack_lib.gradle"
-apply from: "$rootDir/gradle/publish_maven.gradle"
-
-publish {
-    artifactId = 'english'
-    desc = "English pack for AnySoftKeyboard"
-}
+//apply from: "$rootDir/gradle/publish_maven.gradle"
+//
+//publish {
+//    artifactId = 'english'
+//    desc = "English pack for AnySoftKeyboard"
+//}
diff --git a/languages/polish/pack/src/main/res/xml/polish_azerty.xml b/languages/polish/pack/src/main/res/xml/polish_azerty.xml
@@ -16,7 +16,7 @@
 
     <Row>
         <Key android:codes="q" android:keyEdgeFlags="left" android:popupCharacters="" />
-        <Key android:codes="s" android:popupCharacters="" />
+        <Key android:codes="s" android:popupKeyboard="@xml/polish_popup_s" />
         <Key android:codes="d" android:popupCharacters="" />
         <Key android:codes="f" android:popupCharacters="" />
         <Key android:codes="g" android:popupCharacters="" />

diff --git a/languages/polish/pack/src/main/res/xml/polish_colemak.xml b/languages/polish/pack/src/main/res/xml/polish_colemak.xml
@@ -17,7 +17,7 @@
     <Row>
         <Key android:codes="a" android:popupKeyboard="@xml/polish_popup_a" />
         <Key android:codes="r" android:popupCharacters="" />
-        <Key android:codes="s" android:popupCharacters="" />
+        <Key android:codes="s" android:popupKeyboard="@xml/polish_popup_s" />
         <Key android:codes="t" android:popupCharacters="" />
         <Key android:codes="d" android:popupCharacters="" />
         <Key android:codes="h" android:popupCharacters="" />

diff --git a/languages/polish/pack/src/main/res/xml/polish_dvorak.xml b/languages/polish/pack/src/main/res/xml/polish_dvorak.xml
@@ -23,7 +23,7 @@
         <Key android:codes="h" android:popupCharacters="" />
         <Key android:codes="t" android:popupCharacters="" />
         <Key android:codes="n" android:popupKeyboard="@xml/polish_popup_n" />
-        <Key android:codes="s" android:keyEdgeFlags="right" android:popupCharacters="" />
+        <Key android:codes="s" android:keyEdgeFlags="right" android:popupKeyboard="@xml/polish_popup_s" />
     </Row>
 
     <Row>
@@ -38,4 +38,4 @@
         <Key android:codes="v" android:popupCharacters="" />
         <Key android:codes="z" android:keyEdgeFlags="right" android:popupKeyboard="@xml/polish_popup_z" />
     </Row>
-</Keyboard>
+</Keyboard>
diff --git a/languages/polish/pack/src/main/res/xml/polish_popup_s.xml b/languages/polish/pack/src/main/res/xml/polish_popup_s.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='utf-8'?>
+<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"><Row><Key android:codes="ś" /></Row></Keyboard>
diff --git a/languages/polish/pack/src/main/res/xml/polish_qwerty.xml b/languages/polish/pack/src/main/res/xml/polish_qwerty.xml
@@ -16,7 +16,7 @@
 
     <Row>
         <Key android:codes="a" android:horizontalGap="5%p" android:keyEdgeFlags="left" android:popupKeyboard="@xml/polish_popup_a" />
-        <Key android:codes="s" android:popupCharacters="" />
+        <Key android:codes="s" android:popupKeyboard="@xml/polish_popup_s" />
         <Key android:codes="d" android:popupCharacters="" />
         <Key android:codes="f" android:popupCharacters="" />
         <Key android:codes="g" android:popupCharacters="" />

diff --git a/languages/polish/pack/src/main/res/xml/polish_qwertz.xml b/languages/polish/pack/src/main/res/xml/polish_qwertz.xml
@@ -16,7 +16,7 @@
 
     <Row>
         <Key android:codes="a" android:horizontalGap="5%p" android:keyEdgeFlags="left" android:popupKeyboard="@xml/polish_popup_a" />
-        <Key android:codes="s" android:popupCharacters="" />
+        <Key android:codes="s" android:popupKeyboard="@xml/polish_popup_s" />
         <Key android:codes="d" android:popupCharacters="" />
         <Key android:codes="f" android:popupCharacters="" />
         <Key android:codes="g" android:popupCharacters="" />

diff --git a/languages/polish/pack/src/main/res/xml/polish_qzerty.xml b/languages/polish/pack/src/main/res/xml/polish_qzerty.xml
@@ -16,7 +16,7 @@
 
     <Row>
         <Key android:codes="a" android:keyEdgeFlags="left" android:popupKeyboard="@xml/polish_popup_a" />
-        <Key android:codes="s" android:popupCharacters="" />
+        <Key android:codes="s" android:popupKeyboard="@xml/polish_popup_s" />
         <Key android:codes="d" android:popupCharacters="" />
         <Key android:codes="f" android:popupCharacters="" />
         <Key android:codes="g" android:popupCharacters="" />

diff --git a/languages/polish/pack/src/main/res/xml/polish_workman.xml b/languages/polish/pack/src/main/res/xml/polish_workman.xml
@@ -16,7 +16,7 @@
 
     <Row>
         <Key android:codes="a" android:keyEdgeFlags="left" android:popupKeyboard="@xml/polish_popup_a" />
-        <Key android:codes="s" android:popupCharacters="" />
+        <Key android:codes="s" android:popupKeyboard="@xml/polish_popup_s" />
         <Key android:codes="d" android:popupCharacters="" />
         <Key android:codes="f" android:popupCharacters="" />
         <Key android:codes="g" android:popupCharacters="" />

diff --git a/scripts/ci_check.sh b/scripts/ci_check.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -e
 
-./gradlew ${EXTRA_GRADLE_ARGS} check
+./gradlew ${EXTRA_GRADLE_ARGS} check lintDebug
 ./gradlew ${EXTRA_GRADLE_ARGS} verifyReleaseResources
 ./gradlew ${EXTRA_GRADLE_ARGS} generateReleasePlayResources
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<?xml version='1.0' encoding='utf-8'?>
		<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"><Row><Key android:codes="ś" /></Row></Keyboard>