forked from upstream-mirrors/quik
Upgrade to Kotlin v1.7.20
This commit is contained in:
@@ -25,15 +25,14 @@ android {
|
|||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdkVersion 21
|
minSdkVersion 21
|
||||||
targetSdkVersion 25
|
targetSdkVersion 25
|
||||||
versionCode 1
|
|
||||||
versionName "1.0"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
lintOptions {
|
|
||||||
abortOnError false
|
|
||||||
}
|
|
||||||
|
|
||||||
useLibrary 'org.apache.http.legacy'
|
useLibrary 'org.apache.http.legacy'
|
||||||
|
lint {
|
||||||
|
abortOnError false
|
||||||
|
}
|
||||||
|
namespace 'com.klinker.android.send_message'
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|||||||
@@ -1,7 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<manifest
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
package="com.klinker.android.send_message"
|
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
|
|
||||||
<application>
|
<application>
|
||||||
|
|
||||||
|
|||||||
+4
-4
@@ -17,7 +17,7 @@ buildscript {
|
|||||||
ext.exoplayer_version = "2.8.1"
|
ext.exoplayer_version = "2.8.1"
|
||||||
ext.glide_version = "4.8.0"
|
ext.glide_version = "4.8.0"
|
||||||
ext.junit_version = '4.12'
|
ext.junit_version = '4.12'
|
||||||
ext.kotlin_version = '1.3.60'
|
ext.kotlin_version = '1.7.20'
|
||||||
ext.lifecycle_version = '2.1.0'
|
ext.lifecycle_version = '2.1.0'
|
||||||
ext.material_version = '1.0.0'
|
ext.material_version = '1.0.0'
|
||||||
ext.mockito_version = '2.18.3'
|
ext.mockito_version = '2.18.3'
|
||||||
@@ -42,9 +42,9 @@ buildscript {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:4.2.2'
|
classpath 'com.android.tools.build:gradle:7.3.1'
|
||||||
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1'
|
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.2'
|
||||||
classpath 'com.google.gms:google-services:4.2.0'
|
classpath 'com.google.gms:google-services:4.3.10'
|
||||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||||
classpath "io.realm:realm-gradle-plugin:$realm_version"
|
classpath "io.realm:realm-gradle-plugin:$realm_version"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ android {
|
|||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
|
|
||||||
}
|
}
|
||||||
|
namespace 'com.moez.QKSMS.common'
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|||||||
@@ -16,4 +16,4 @@
|
|||||||
~ You should have received a copy of the GNU General Public License
|
~ You should have received a copy of the GNU General Public License
|
||||||
~ along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
~ along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||||
-->
|
-->
|
||||||
<manifest package="com.moez.QKSMS.common" />
|
<manifest />
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ android {
|
|||||||
withAnalytics { dimension "analytics" }
|
withAnalytics { dimension "analytics" }
|
||||||
noAnalytics { dimension "analytics" }
|
noAnalytics { dimension "analytics" }
|
||||||
}
|
}
|
||||||
|
namespace 'com.moez.QKSMS.data'
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|||||||
@@ -16,4 +16,4 @@
|
|||||||
~ You should have received a copy of the GNU General Public License
|
~ You should have received a copy of the GNU General Public License
|
||||||
~ along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
~ along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||||
-->
|
-->
|
||||||
<manifest package="com.moez.QKSMS.data" />
|
<manifest />
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ android {
|
|||||||
minSdkVersion 21
|
minSdkVersion 21
|
||||||
targetSdkVersion 29
|
targetSdkVersion 29
|
||||||
}
|
}
|
||||||
|
namespace 'com.moez.QKSMS.domain'
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|||||||
@@ -16,4 +16,4 @@
|
|||||||
~ You should have received a copy of the GNU General Public License
|
~ You should have received a copy of the GNU General Public License
|
||||||
~ along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
~ along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||||
-->
|
-->
|
||||||
<manifest package="com.moez.QKSMS.domain" />
|
<manifest />
|
||||||
|
|||||||
+1
-1
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
|
|||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
|
||||||
|
|||||||
@@ -60,14 +60,15 @@ android {
|
|||||||
jvmTarget = "1.8"
|
jvmTarget = "1.8"
|
||||||
}
|
}
|
||||||
|
|
||||||
lintOptions {
|
|
||||||
abortOnError false
|
|
||||||
}
|
|
||||||
|
|
||||||
productFlavors {
|
productFlavors {
|
||||||
withAnalytics { dimension "analytics" }
|
withAnalytics { dimension "analytics" }
|
||||||
noAnalytics { dimension "analytics" }
|
noAnalytics { dimension "analytics" }
|
||||||
}
|
}
|
||||||
|
lint {
|
||||||
|
abortOnError false
|
||||||
|
}
|
||||||
|
namespace 'com.moez.QKSMS'
|
||||||
|
|
||||||
if (System.getenv("CI") == "true") {
|
if (System.getenv("CI") == "true") {
|
||||||
signingConfigs.release.storeFile = file("../keystore")
|
signingConfigs.release.storeFile = file("../keystore")
|
||||||
|
|||||||
@@ -17,8 +17,7 @@
|
|||||||
~ You should have received a copy of the GNU General Public License
|
~ You should have received a copy of the GNU General Public License
|
||||||
~ along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
~ along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||||
-->
|
-->
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
package="com.moez.QKSMS">
|
|
||||||
|
|
||||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
||||||
<uses-permission android:name="android.permission.CALL_PHONE" />
|
<uses-permission android:name="android.permission.CALL_PHONE" />
|
||||||
|
|||||||
@@ -408,6 +408,8 @@ class MainViewModel @Inject constructor(
|
|||||||
val page = state.page.copy(addContact = add, markPinned = pin, markRead = read, selected = selected)
|
val page = state.page.copy(addContact = add, markPinned = pin, markRead = read, selected = selected)
|
||||||
newState { copy(page = page) }
|
newState { copy(page = page) }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
is Searching -> {} // Ignore
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.autoDisposable(view.scope())
|
.autoDisposable(view.scope())
|
||||||
|
|||||||
+1
-1
@@ -29,7 +29,7 @@ import javax.inject.Inject
|
|||||||
class UpgradeButtonExperiment @Inject constructor(
|
class UpgradeButtonExperiment @Inject constructor(
|
||||||
context: Context,
|
context: Context,
|
||||||
analytics: AnalyticsManager
|
analytics: AnalyticsManager
|
||||||
) : Experiment<@StringRes Int>(context, analytics) {
|
) : Experiment<Int>(context, analytics) {
|
||||||
|
|
||||||
override val key: String = "Upgrade Button"
|
override val key: String = "Upgrade Button"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user