Skip to content

Commit

Permalink
Update SQLite to v3.45.0 (#189)
Browse files Browse the repository at this point in the history
  • Loading branch information
SteinerOk authored Jan 22, 2024
1 parent 4fb4458 commit 12e9161
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 31 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
Change Log
==========

## 3.45.0
- [SQLite 3.45.0](https://www.sqlite.org/releaselog/3_45_0.html)
- [SQLite 3.44.2](https://www.sqlite.org/releaselog/3_44_2.html)
- [SQLite 3.44.1](https://www.sqlite.org/releaselog/3_44_1.html)
- [SQLite 3.44.0](https://www.sqlite.org/releaselog/3_44_0.html)
- [SQLite 3.43.2](https://www.sqlite.org/releaselog/3_43_2.html)
- [SQLite 3.43.1](https://www.sqlite.org/releaselog/3_43_1.html)

## 3.43.0
- [SQLite 3.43.0](https://www.sqlite.org/releaselog/3_43_0.html)

Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Use new SQLite features:
- **[JSON1 extension](https://www.sqlite.org/json1.html)**
- **[Common Table expressions](https://www.sqlite.org/lang_with.html)**
- **[Indexes on expressions](https://www.sqlite.org/expridx.html)**
- **[Full Text Search 5](https://www.sqlite.org/fts5.html)**
- **[Full-Text Search 5](https://www.sqlite.org/fts5.html)**
- **[Generated Columns](https://www.sqlite.org/gencol.html)**
- **[DROP COLUMN support](https://www.sqlite.org/lang_altertable.html#altertabdropcol)**

Expand All @@ -51,7 +51,7 @@ Then add the sqlite-android artifact from this repository as a dependency:

```gradle
dependencies {
implementation 'com.github.requery:sqlite-android:3.43.0'
implementation 'com.github.requery:sqlite-android:3.45.0'
}
```
Then change usages of `android.database.sqlite.SQLiteDatabase` to
Expand Down Expand Up @@ -115,7 +115,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.43.0-X, where X is the revision number.
wrapper API, a revision number is added e.g., 3.45.0-X, where X is the revision number.

Acknowledgements
----------------
Expand All @@ -134,12 +134,12 @@ Changes
CursorWindow.
- Reuse of android.database.sqlite.*, the original SQLite bindings replicated the entire
android.database.sqlite API structure including exceptions & interfaces. This project does not
do that, instead it reuses the original classes/interfaces when possible in order to simplify
do that, instead it reuses the original classes/interfaces when possible to simplify
migration and/or use with existing code.
- Unit tests added
- Compile with [clang](http://clang.llvm.org/) toolchain
- Compile with FTS3, FTS4, & JSON1 extension
- Migrate to gradle build
- Migrate to Gradle build
- buildscript dynamically fetches and builds the latest sqlite source from sqlite.org
- Added consumer proguard rules
- Use androidx-core version of `CancellationSignal`
Expand All @@ -153,7 +153,7 @@ Changes
License
-------

Copyright (C) 2017-2023 requery.io
Copyright (C) 2017-2024 requery.io
Copyright (C) 2005-2012 The Android Open Source Project

Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
plugins {
id "com.android.library" version "8.1.1" apply false
id "de.undercouch.download" version "5.4.0" apply false
id "com.android.library" version "8.2.1" apply false
id "de.undercouch.download" version "5.5.0" apply false
}
48 changes: 31 additions & 17 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,35 @@
## For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
#
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx1024m -XX:MaxPermSize=256m
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
#
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. For more details, visit
# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects
# org.gradle.parallel=true
#Fri Jan 19 20:33:06 EET 2024
#
org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
android.useAndroidX=true

# Disabling unused build features
#
GROUP=io.requery
VERSION_NAME=3.45.0-SNAPSHOT
#
POM_DEVELOPER_ID=TODO
POM_DEVELOPER_NAME=TODO
POM_DEVELOPER_URL=TODO
POM_INCEPTION_YEAR=TODO
POM_LICENCE_DIST=repo
POM_LICENCE_NAME=The Apache Software License, Version 2.0
POM_LICENCE_URL=http\://www.apache.org/licenses/LICENSE-2.0.txt
POM_SCM_CONNECTION=scm\:git\:git\://github.com/requery/sqlite-android.git
POM_SCM_DEV_CONNECTION=scm\:git\:ssh\://[email protected]/requery/sqlite-android.git
POM_SCM_URL=https\://github.com/requery/sqlite-android/
POM_URL=https\://github.com/requery/sqlite-android/
#
android.defaults.buildfeatures.aidl=false
android.defaults.buildfeatures.buildconfig=false
android.defaults.buildfeatures.databinding=false
Expand All @@ -9,18 +38,3 @@ android.defaults.buildfeatures.resvalues=false
android.defaults.buildfeatures.shaders=false
android.defaults.buildfeatures.viewbinding=false
android.library.defaults.buildfeatures.androidresources=false

# Publishing bits
GROUP=io.requery
POM_URL=https://github.com/requery/sqlite-android/
POM_SCM_URL=https://github.com/requery/sqlite-android/
POM_SCM_CONNECTION=scm:git:git://github.com/requery/sqlite-android.git
POM_SCM_DEV_CONNECTION=scm:git:ssh://[email protected]/requery/sqlite-android.git
POM_LICENCE_NAME=The Apache Software License, Version 2.0
POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
POM_LICENCE_DIST=repo
POM_DEVELOPER_ID=TODO
POM_DEVELOPER_NAME=TODO
POM_DEVELOPER_URL=TODO
POM_INCEPTION_YEAR=TODO
VERSION_NAME=3.43.0-SNAPSHOT
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
10 changes: 5 additions & 5 deletions sqlite-android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ import com.vanniktech.maven.publish.SonatypeHost
plugins {
id "de.undercouch.download"
id "com.android.library"
id "com.vanniktech.maven.publish" version "0.25.3"
id "com.vanniktech.maven.publish" version "0.27.0"
}

android {
buildToolsVersion = "34.0.0"
ndkVersion "25.2.9519653"
ndkVersion "26.1.10909125"

compileSdk 34

Expand Down Expand Up @@ -48,8 +48,8 @@ android {
}

dependencies {
api("androidx.core:core:1.10.1")
api("androidx.sqlite:sqlite:2.3.1")
api("androidx.core:core:1.12.0")
api("androidx.sqlite:sqlite:2.4.0")
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test:core:1.5.0")
androidTestImplementation("androidx.test:runner:1.5.2")
Expand All @@ -58,7 +58,7 @@ dependencies {
}

ext {
sqliteDistributionUrl = "https://www.sqlite.org/2023/sqlite-amalgamation-3430000.zip"
sqliteDistributionUrl = "https://www.sqlite.org/2024/sqlite-amalgamation-3450000.zip"
}

tasks.register("downloadSqlite", Download) {
Expand Down

0 comments on commit 12e9161

Please sign in to comment.