Update dependencies and SQLite to version 3.39.0 (#160)

requery · Jul 7, 2022 · 94faa96 · 94faa96
1 parent 6b8ae30
commit 94faa96
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 Change Log
 ==========
 
+## 3.39.0
+- [SQLite 3.39.0](https://www.sqlite.org/releaselog/3_39_0.html)
+-
 ## 3.38.5
 - [SQLite 3.38.5](https://www.sqlite.org/releaselog/3_38_5.html)
 

diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 
 This is an Android specific distribution of the latest versions of SQLite. It contains the latest
 SQLite version and the Android specific database APIs derived from AOSP packaged as an AAR
-library distributed on jcenter.
+library distributed on jitpack.
 
 Why?
 ----
@@ -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.38.5'
+    implementation 'com.github.requery:sqlite-android:3.39.0'
 }
 ```
 Then change usages of `android.database.sqlite.SQLiteDatabase` to
@@ -150,7 +150,7 @@ Changes
 License
 -------
 
-    Copyright (C) 2017-2021 requery.io
+    Copyright (C) 2017-2022 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
@@ -1,17 +1,4 @@
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.2'
-        classpath 'org.apache.httpcomponents:httpclient:4.5.13'
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-    }
+plugins {
+    id 'com.android.library' version '7.2.1' apply false
+    id 'de.undercouch.download' version '5.1.0' apply false
 }
diff --git 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-6.8.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
@@ -1,2 +1,18 @@
+pluginManagement {
+    repositories {
+        google()
+        gradlePluginPortal()
+        mavenCentral()
+    }
+}
+
+dependencyResolutionManagement {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
 rootProject.name = 'requery-sqlite'
+
 include ':sqlite-android'
diff --git a/sqlite-android/build.gradle b/sqlite-android/build.gradle
@@ -1,18 +1,16 @@
 plugins {
-    id 'de.undercouch.download' version '4.1.1'
+    id 'de.undercouch.download'
+    id 'com.android.library'
+    id 'maven-publish'
 }
 
-apply plugin: 'com.android.library'
-apply plugin: 'maven-publish'
-apply plugin: 'de.undercouch.download'
-
 group = 'io.requery'
-version = '3.38.5'
+version = '3.39.0'
 description = 'Android SQLite compatibility library'
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.3"
+    compileSdkVersion 32
+    buildToolsVersion "32.0.0"
     ndkVersion '24.0.8215888'
 
     defaultConfig {
@@ -24,6 +22,7 @@ android {
             abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
         }
     }
+
     buildTypes {
         release {
             minifyEnabled false
@@ -34,8 +33,8 @@ android {
         abortOnError false
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     externalNativeBuild {
         ndkBuild {
@@ -49,16 +48,16 @@ android {
 }
 
 dependencies {
-    api 'androidx.sqlite:sqlite:2.1.0'
-    api 'androidx.core:core:1.5.0'
-    androidTestImplementation 'androidx.test:core:1.3.0'
-    androidTestImplementation 'androidx.test:runner:1.3.0'
-    androidTestImplementation 'androidx.test:rules:1.3.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    api 'androidx.sqlite:sqlite:2.2.0'
+    api 'androidx.core:core:1.8.0'
+    androidTestImplementation 'androidx.test:core:1.4.0'
+    androidTestImplementation 'androidx.test:runner:1.4.0'
+    androidTestImplementation 'androidx.test:rules:1.4.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
 }
 
 ext {
-    sqliteDistributionUrl = 'https://www.sqlite.org/2022/sqlite-amalgamation-3380500.zip'
+    sqliteDistributionUrl = 'https://www.sqlite.org/2022/sqlite-amalgamation-3390000.zip'
     pomXml = {
         resolveStrategy = DELEGATE_FIRST
         name project.name