compiles correctly now

This commit is contained in:
octoshrimpy
2023-11-13 12:33:27 -07:00
parent 9c59374fad
commit 4f7a41fe97
9 changed files with 30 additions and 20 deletions
+2 -1
View File
@@ -20,7 +20,7 @@ apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
android {
compileSdkVersion 25
compileSdk 25
defaultConfig {
minSdkVersion 23
@@ -41,6 +41,7 @@ dependencies {
implementation 'com.squareup.okhttp:okhttp:2.5.0'
implementation 'com.squareup.okhttp:okhttp-urlconnection:2.5.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
// implementation 'javax.annotation:javax.annotation-api:1.3.2'
}
repositories {
+2 -2
View File
@@ -24,7 +24,7 @@ buildscript {
ext.mockito_version = '2.18.3'
ext.moshi_version = '1.8.0'
ext.okhttp3_version = '4.10.0'
ext.realm_version = '10.13.0'
ext.realm_version = '10.16.0'
ext.realm_adapters_version = '3.1.0'
ext.rxandroid_version = '2.0.1'
ext.rxdogtag_version = '0.2.0'
@@ -43,7 +43,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:7.3.1'
classpath 'com.android.tools.build:gradle:8.1.2'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.2'
classpath 'com.google.gms:google-services:4.3.14'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+1 -1
View File
@@ -20,7 +20,7 @@ apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
android {
compileSdkVersion 33
compileSdk 33
defaultConfig {
minSdkVersion 23
+4 -2
View File
@@ -21,7 +21,7 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt'
android {
compileSdkVersion 33
compileSdk 33
publishNonDefault true
flavorDimensions "analytics"
@@ -62,7 +62,9 @@ dependencies {
implementation "com.google.dagger:dagger-android-support:$dagger_version"
kapt "com.google.dagger:dagger-android-processor:$dagger_version"
kapt "com.google.dagger:dagger-compiler:$dagger_version"
compileOnly "javax.annotation:jsr250-api:1.0"
//Resolve jdk8+ Generation Annotations - javax annotation does not exist
compileOnly 'com.github.pengrad:jdk9-deps:1.0'
// compileOnly "javax.annotation:jsr250-api:1.0"
// rxjava
implementation "io.reactivex.rxjava2:rxandroid:$rxandroid_version"
+3 -2
View File
@@ -23,7 +23,7 @@ apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'
android {
compileSdkVersion 33
compileSdk 33
compileOptions {
sourceCompatibility 1.8
@@ -44,7 +44,8 @@ dependencies {
// dagger
implementation "com.google.dagger:dagger:$dagger_version"
kapt "com.google.dagger:dagger-compiler:$dagger_version"
compileOnly "javax.annotation:jsr250-api:1.0"
//Resolve jdk8+ Generation Annotations - javax annotation does not exist
compileOnly 'com.github.pengrad:jdk9-deps:1.0'
// realm
kapt "io.realm:realm-annotations:$realm_version"
+3
View File
@@ -15,6 +15,9 @@ org.gradle.jvmargs=-Xmx1536m
org.gradle.caching=true
android.useAndroidX=true
android.enableJetifier=true
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
+1 -1
View File
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
+5 -2
View File
@@ -23,7 +23,7 @@ apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'
android {
compileSdkVersion 33
compileSdk 33
flavorDimensions "analytics"
defaultConfig {
@@ -132,7 +132,10 @@ dependencies {
implementation "com.google.dagger:dagger-android-support:$dagger_version"
kapt "com.google.dagger:dagger-compiler:$dagger_version"
kapt "com.google.dagger:dagger-android-processor:$dagger_version"
compileOnly "javax.annotation:jsr250-api:1.0"
// compileOnly "javax.annotation:jsr250-api:1.0"
//Resolve jdk8+ Generation Annotations - javax annotation does not exist
compileOnly 'com.github.pengrad:jdk9-deps:1.0'
// implementation 'javax.annotation:javax.annotation-api:1.3.2'
// ezvcard
implementation('com.googlecode.ez-vcard:ez-vcard:0.10.4', {
+9 -9
View File
@@ -18,7 +18,7 @@
-->
<resources>
<string name="app_name" translatable="false">QKSMS</string>
<string name="app_name" translatable="false">QUIK</string>
<string name="shortcut_compose_long_label">New conversation</string>
<string name="shortcut_compose_short_label">Compose</string>
@@ -63,7 +63,7 @@
<string name="archived_empty_text">Your archived conversations will appear here</string>
<string name="main_fab_cd">Start new conversation</string>
<string name="main_default_sms_title">Love texting again</string>
<string name="main_default_sms_message">Make QKSMS your default SMS app</string>
<string name="main_default_sms_message">Make QUIK your default SMS app</string>
<string name="main_default_sms_change">Change</string>
<string name="main_permission_required">Permission required</string>
<string name="main_permission_sms">QKSMS needs permission to send and view SMS messages</string>
@@ -83,7 +83,7 @@
<string name="drawer_plus_banner_title" translatable="false">QKSMS+</string>
<string name="drawer_plus_banner_summary">Unlock amazing new features, and support development</string>
<string name="rate_title">Enjoying QKSMS?</string>
<string name="rate_title">Enjoying QUIK?</string>
<string name="rate_summary">Share some love and rate us on Google Play!</string>
<string name="rate_okay">OKAY!</string>
<string name="rate_dismiss">DISMISS</string>
@@ -187,7 +187,7 @@
<string name="backup_selected_backup_error_message">Couldn\'t read backup file</string>
<string name="backup_selected_backup_details_title">Backup details</string>
<string name="backup_restore_dialog_title">Backups</string>
<string name="backup_restore_dialog_summary" translatable="false">/QKSMS/Backups</string>
<string name="backup_restore_dialog_summary" translatable="false">/QUIK/Backups</string>
<string name="backup_restore_dialog_empty">No backups found</string>
<string name="backup_disclaimer">Currently, only SMS is supported by Backup and Restore. MMS support and scheduled backups will be coming soon!</string>
<string name="backup_now">Backup now</string>
@@ -280,7 +280,7 @@
<string name="settings_mms_size_title">Auto-compress MMS attachments</string>
<string name="settings_sync_title">Sync messages</string>
<string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string>
<string name="settings_about_title">About QKSMS</string>
<string name="settings_about_title">About QUIK</string>
<string name="settings_version">Version %s</string>
<string name="settings_logging_enabled">Debug logging enabled</string>
<string name="settings_logging_disabled">Debug logging disabled</string>
@@ -293,8 +293,8 @@
<string name="blocking_conversations">Blocked conversations</string>
<string name="blocking_manager_title">Blocking Manager</string>
<string name="blocking_manager_qksms_title">QKSMS</string>
<string name="blocking_manager_qksms_summary">Built-in blocking functionality in QKSMS</string>
<string name="blocking_manager_qksms_title">QUIK</string>
<string name="blocking_manager_qksms_summary">Built-in blocking functionality in QUIK</string>
<string name="blocking_manager_call_blocker_title" translatable="false">Call Blocker - Incoming/Outgoing</string>
<string name="blocking_manager_call_blocker_summary">Block spam messages, numbers &amp; unknown calls with blacklist &amp; Schedule</string>
<string name="blocking_manager_call_control_title" translatable="false">Call Control</string>
@@ -368,7 +368,7 @@
<string name="qksms_plus_respond_title">Auto-respond</string>
<string name="qksms_plus_respond_summary">Automatically respond to incoming messages with a preset response</string>
<string name="qksms_plus_more_title">More</string>
<string name="qksms_plus_more_summary">QKSMS is under active development, and your purchase will include all future QKSMS+ features!</string>
<string name="qksms_plus_more_summary">QUIK is under active development, and your purchase will include all future QKSMS+ features!</string>
<string name="widget_loading">Loading…</string>
<string name="widget_more">View more conversations</string>
@@ -392,7 +392,7 @@
<string name="about_license" translatable="false">GNU General Public License v3.0</string>
<string name="about_copyright" translatable="false">© 2014–2019</string>
<string name="changelog_title" translatable="false">New in QKSMS</string>
<string name="changelog_title" translatable="false">New in QUIK</string>
<string name="changelog_version" translatable="false">Version %s</string>
<string name="changelog_added" translatable="false">Added</string>
<string name="changelog_improved" translatable="false">Improved</string>