Merge branch 'master' into TIMOB-28458

tidev · Jun 17, 2021 · 0783c97 · 0783c97
2 parents 176df34 + 7adb187
commit 0783c97
Show file tree

Hide file tree

Showing 98 changed files with 3,437 additions and 4,464 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,8 @@
+version: 2
+updates:
+- package-ecosystem: npm
+  directory: "/"
+  schedule:
+    interval: weekly
+  open-pull-requests-limit: 10
+
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
@@ -11,7 +11,7 @@ jobs:
     name: Backport
     steps:
       - name: Backport
-        uses: ewanharris/backport@v1.0.28-24
+        uses: ewanharris/backport@v1.0.28-25
         with:
           bot_username: build
           bot_token: ${{ secrets.BOT_TOKEN }}

diff --git a/android/build.gradle b/android/build.gradle
@@ -6,23 +6,23 @@
  */
 
 buildscript {
-	ext.kotlin_version = '1.4.30'
+	ext.kotlin_version = '1.5.0'
 
 	repositories {
 		google()
-		jcenter()
+		mavenCentral()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:4.1.2'
-		classpath 'com.google.gms:google-services:4.3.5'
+		classpath 'com.android.tools.build:gradle:4.2.1'
+		classpath 'com.google.gms:google-services:4.3.8'
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 	}
 }
 
 allprojects {
 	repositories {
 		google()
-		jcenter()
+		mavenCentral()
 	}
 
 	// Load plugin used to enforce our Java coding style guidelines.

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/android/modules/ui/lib/WebViewClient.jar b/android/modules/ui/lib/WebViewClient.jar
diff --git a/android/modules/ui/res/layout/titanium_ui_date_picker_calendar.xml b/android/modules/ui/res/layout/titanium_ui_date_picker_calendar.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<DatePicker xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="wrap_content"
+    android:layout_width="wrap_content"
+    android:datePickerMode ="calendar"
+    android:calendarViewShown="true"
+    android:spinnersShown="false"/>
diff --git a/android/modules/ui/res/layout/titanium_ui_date_picker_spinner.xml b/android/modules/ui/res/layout/titanium_ui_date_picker_spinner.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ti.modules.titanium.ui.widget.picker.CustomDatePicker xmlns:android="http://schemas.android.com/apk/res/android"
+<DatePicker xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="wrap_content"
     android:layout_width="wrap_content"
-    android:datePickerMode ="spinner"/>
+    android:datePickerMode ="spinner"
+    android:calendarViewShown="false"
+    android:spinnersShown="true"/>
diff --git a/android/modules/ui/res/layout/titanium_ui_spinner.xml b/android/modules/ui/res/layout/titanium_ui_spinner.xml
diff --git a/android/modules/ui/src/java/kankan/wheel/widget/NumericWheelAdapter.java b/android/modules/ui/src/java/kankan/wheel/widget/NumericWheelAdapter.java
diff --git a/android/modules/ui/src/java/kankan/wheel/widget/WheelAdapter.java b/android/modules/ui/src/java/kankan/wheel/widget/WheelAdapter.java