diff --git a/.gitignore b/.gitignore index be4479d..458d04c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +/.idea *.iml .gradle /local.properties @@ -14,3 +15,5 @@ .cxx local.properties /gradle/wrapper/gradle-wrapper.jar +/app/release +/signing_key.jks diff --git a/app/build.gradle b/app/build.gradle index a805721..7bc1735 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,13 +6,11 @@ plugins { } android { - compileSdkVersion 34 - buildToolsVersion "34.0.0" - defaultConfig { applicationId "kellerar.triliumdroid" minSdkVersion 26 - targetSdkVersion 34 + compileSdk 35 + targetSdkVersion 35 versionCode 1 versionName "0.59.4" @@ -28,6 +26,9 @@ android { buildConfigField "long", "TIMESTAMP", System.currentTimeMillis() + "L" } + debug { + applicationIdSuffix ".debug" + } } buildFeatures { viewBinding true @@ -44,18 +45,17 @@ android { } dependencies { - implementation 'androidx.core:core-ktx:1.10.1' - def nav_version = "2.7.1" + def nav_version = "2.8.4" - implementation "org.jetbrains.kotlin:kotlin-stdlib:1.8.20" - implementation 'androidx.core:core-ktx:1.10.1' - implementation 'androidx.appcompat:appcompat:1.6.1' + implementation "org.jetbrains.kotlin:kotlin-stdlib:2.0.20" + implementation 'androidx.core:core-ktx:1.15.0' + implementation 'androidx.appcompat:appcompat:1.7.0' implementation "androidx.navigation:navigation-fragment-ktx:$nav_version" implementation "androidx.navigation:navigation-ui-ktx:$nav_version" - implementation "androidx.fragment:fragment-ktx:1.6.1" - implementation 'com.google.android.material:material:1.9.0' + implementation "androidx.fragment:fragment-ktx:1.8.5" + implementation 'com.google.android.material:material:1.12.0' implementation "androidx.preference:preference-ktx:1.2.1" - implementation "com.squareup.okhttp3:okhttp:4.10.0" + implementation "com.squareup.okhttp3:okhttp:4.12.0" implementation "org.wordpress:aztec:v1.7.0" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3700d8d..144940a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -30,7 +30,7 @@ + Log.e(TAG, "failed to connect to server", error) // TODO }) } diff --git a/build.gradle b/build.gradle index a6bb933..746de74 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.1.2' + classpath 'com.android.tools.build:gradle:8.7.3' classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20' // NOTE: Do not place your application dependencies here; they belong @@ -19,8 +19,4 @@ allprojects { mavenCentral() maven { url "https://a8c-libs.s3.amazonaws.com/android" } } -} - -task clean(type: Delete) { - delete rootProject.buildDir } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index da1db5f..19cfad9 100644 --- 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-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists