From f5aaf9066da2defc1a8996760fad7f61d086ec8c Mon Sep 17 00:00:00 2001 From: Ihor Kushnirenko Date: Fri, 17 Mar 2023 17:50:28 +0200 Subject: [PATCH] Update SQLite to v3.41.1 --- CHANGELOG.md | 5 +++++ README.md | 6 +++--- build.gradle | 4 ++-- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 3 ++- sqlite-android/build.gradle | 26 ++++++++++++++---------- 6 files changed, 28 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d37f06b6..9ece1e2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ Change Log ========== +## 3.41.1 +- [SQLite 3.41.1](https://www.sqlite.org/releaselog/3_41_1.html) +- [SQLite 3.41.0](https://www.sqlite.org/releaselog/3_41_0.html) +- Fix getSqlStatementType statement type detection + ## 3.40.1 - [SQLite 3.40.1](https://www.sqlite.org/releaselog/3_40_1.html) - [SQLite 3.40.0](https://www.sqlite.org/releaselog/3_40_0.html) diff --git a/README.md b/README.md index 81a06898..8ead72cb 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ Then add the sqlite-android artifact from this repository as a dependency: ```gradle dependencies { - implementation 'com.github.requery:sqlite-android:3.40.1' + implementation 'com.github.requery:sqlite-android:3.41.1' } ``` Then change usages of `android.database.sqlite.SQLiteDatabase` to @@ -113,7 +113,7 @@ Versioning ---------- The library is versioned after the version of SQLite it contains. For changes specific to just the -wrapper API a revision number is added e.g. 3.40.1-X, where X is the revision number. +wrapper API a revision number is added e.g. 3.41.1-X, where X is the revision number. Acknowledgements ---------------- @@ -151,7 +151,7 @@ Changes License ------- - Copyright (C) 2017-2022 requery.io + Copyright (C) 2017-2023 requery.io Copyright (C) 2005-2012 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/build.gradle b/build.gradle index 62b1c001..9e17d471 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ plugins { - id 'com.android.library' version '7.3.1' apply false - id 'de.undercouch.download' version '5.3.0' apply false + id 'com.android.library' version '7.4.2' apply false + id 'de.undercouch.download' version '5.3.1' apply false } diff --git a/gradle.properties b/gradle.properties index fb30adeb..23b3adaa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,4 +22,4 @@ POM_DEVELOPER_ID=TODO POM_DEVELOPER_NAME=TODO POM_DEVELOPER_URL=TODO POM_INCEPTION_YEAR=TODO -VERSION_NAME=3.40.1-SNAPSHOT \ No newline at end of file +VERSION_NAME=3.41.1-SNAPSHOT \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 070cb702..bdc9a83b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/sqlite-android/build.gradle b/sqlite-android/build.gradle index ac8283ea..039811c9 100644 --- a/sqlite-android/build.gradle +++ b/sqlite-android/build.gradle @@ -3,18 +3,20 @@ import com.vanniktech.maven.publish.SonatypeHost plugins { id 'de.undercouch.download' id 'com.android.library' - id 'com.vanniktech.maven.publish' version '0.23.0' + id 'com.vanniktech.maven.publish' version '0.24.0' } android { + buildToolsVersion "33.0.2" + ndkVersion '25.2.9519653' compileSdkVersion 33 - buildToolsVersion "33.0.1" - ndkVersion '25.1.8937393' + + namespace "io.requery.android.sqlite" defaultConfig { - minSdkVersion 14 + minSdkVersion 19 versionName VERSION_NAME - namespace "io.requery.android.sqlite" + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles 'proguard-rules.pro' ndk { @@ -28,13 +30,15 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + lintOptions { abortOnError false } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } + externalNativeBuild { ndkBuild { path 'src/main/jni/Android.mk' @@ -43,17 +47,17 @@ android { } dependencies { - api 'androidx.sqlite:sqlite:2.2.0' api 'androidx.core:core:1.9.0' + api 'androidx.sqlite:sqlite:2.3.0' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test:core:1.5.0' - androidTestImplementation 'androidx.test:runner:1.5.1' + androidTestImplementation 'androidx.test:runner:1.5.2' androidTestImplementation 'androidx.test:rules:1.5.0' - androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.ext:junit:1.1.5' } ext { - sqliteDistributionUrl = 'https://www.sqlite.org/2022/sqlite-amalgamation-3400100.zip' + sqliteDistributionUrl = 'https://www.sqlite.org/2023/sqlite-amalgamation-3410100.zip' } task downloadSqlite(type: Download) {