From 85e92beadffffd5a832ffe66d50a28641dd0d2f0 Mon Sep 17 00:00:00 2001 From: Teodor G Date: Sat, 15 Jan 2022 15:28:02 +0200 Subject: [PATCH 1/3] [SDK-Update] bumped to SDK 31 --- app/build.gradle | 9 ++++----- build.gradle | 2 +- dispatcher-compiler/build.gradle | 2 +- dispatcher-runtime/build.gradle | 2 +- runtime/build.gradle | 2 +- sqlite-framework/build.gradle | 2 +- sqlite/build.gradle | 2 +- 7 files changed, 10 insertions(+), 11 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 046047d..97b9f21 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,15 +3,14 @@ plugins { } android { - compileSdk 30 - buildToolsVersion "30.0.3" + compileSdk 31 defaultConfig { applicationId "com.zeoflow.depot" minSdk 21 - targetSdk 30 - versionCode 1 - versionName "1.0.0" + targetSdk 31 + versionCode 3 + versionName "1.0.2" } buildTypes { diff --git a/build.gradle b/build.gradle index 13e05f5..41142f3 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:7.1.0-alpha02' + classpath 'com.android.tools.build:gradle:7.1.0-rc01' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.10" classpath("com.google.devtools.ksp:symbol-processing-gradle-plugin:1.5.0-1.0.0-alpha10") classpath("com.google.code.gson:gson:2.8.0") diff --git a/dispatcher-compiler/build.gradle b/dispatcher-compiler/build.gradle index 19337ff..c0a4c24 100644 --- a/dispatcher-compiler/build.gradle +++ b/dispatcher-compiler/build.gradle @@ -4,7 +4,7 @@ plugins { } android { - compileSdk 30 + compileSdk 31 defaultConfig { multiDexEnabled true } diff --git a/dispatcher-runtime/build.gradle b/dispatcher-runtime/build.gradle index 5e968c5..f9b2276 100644 --- a/dispatcher-runtime/build.gradle +++ b/dispatcher-runtime/build.gradle @@ -4,7 +4,7 @@ plugins { } android { - compileSdk 30 + compileSdk 31 } dependencies { diff --git a/runtime/build.gradle b/runtime/build.gradle index 05e63b3..857478c 100644 --- a/runtime/build.gradle +++ b/runtime/build.gradle @@ -5,7 +5,7 @@ plugins { } android { - compileSdk 30 + compileSdk 31 buildFeatures { aidl = true } diff --git a/sqlite-framework/build.gradle b/sqlite-framework/build.gradle index 8a726b3..9c8a936 100644 --- a/sqlite-framework/build.gradle +++ b/sqlite-framework/build.gradle @@ -4,7 +4,7 @@ plugins { } android { - compileSdk 30 + compileSdk 31 } dependencies { diff --git a/sqlite/build.gradle b/sqlite/build.gradle index 7fdff71..ad11f6b 100644 --- a/sqlite/build.gradle +++ b/sqlite/build.gradle @@ -19,7 +19,7 @@ plugins { } android { - compileSdk 30 + compileSdk 31 } dependencies { From 2ff16c75beba0be620682daba2588ccf846a3450 Mon Sep 17 00:00:00 2001 From: Teodor G Date: Sat, 15 Jan 2022 15:34:13 +0200 Subject: [PATCH 2/3] [SDK-Update] fixed manifest merging errors for sdk 31 --- app/src/main/AndroidManifest.xml | 3 ++- dispatcher-compiler/src/main/AndroidManifest.xml | 2 +- dispatcher-runtime/src/main/AndroidManifest.xml | 2 +- runtime/src/main/AndroidManifest.xml | 4 ++-- sqlite-framework/src/main/AndroidManifest.xml | 2 +- sqlite/src/main/AndroidManifest.xml | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5e26b56..c84c4ad 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -9,7 +9,8 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/Theme.Depot"> - + diff --git a/dispatcher-compiler/src/main/AndroidManifest.xml b/dispatcher-compiler/src/main/AndroidManifest.xml index f629fa1..5445b98 100644 --- a/dispatcher-compiler/src/main/AndroidManifest.xml +++ b/dispatcher-compiler/src/main/AndroidManifest.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/dispatcher-runtime/src/main/AndroidManifest.xml b/dispatcher-runtime/src/main/AndroidManifest.xml index 334a69c..47a71f6 100644 --- a/dispatcher-runtime/src/main/AndroidManifest.xml +++ b/dispatcher-runtime/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="com.zeoflow.depot.dispatcher.runtime"> + package="com.zeoflow.depot.runtime"> diff --git a/sqlite-framework/src/main/AndroidManifest.xml b/sqlite-framework/src/main/AndroidManifest.xml index 2087a32..86dd13c 100644 --- a/sqlite-framework/src/main/AndroidManifest.xml +++ b/sqlite-framework/src/main/AndroidManifest.xml @@ -13,4 +13,4 @@ See the License for the specific language governing permissions and limitations under the License. --> - + diff --git a/sqlite/src/main/AndroidManifest.xml b/sqlite/src/main/AndroidManifest.xml index 4017f8c..3fd61c9 100644 --- a/sqlite/src/main/AndroidManifest.xml +++ b/sqlite/src/main/AndroidManifest.xml @@ -13,4 +13,4 @@ See the License for the specific language governing permissions and limitations under the License. --> - + From 5abe883f6294fbb176ca701fc0d29cfd2a1e75a1 Mon Sep 17 00:00:00 2001 From: Teodor G Date: Sat, 15 Jan 2022 15:36:43 +0200 Subject: [PATCH 3/3] [Version] bumped to 1.0.2 --- gradle.properties | 7 ++++++- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index ccdc8a2..a6525fb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,7 +24,7 @@ kotlin.code.style=official # Maven POM_NAME=Depot POM_PACKAGING=aar -VERSION_NAME=1.0.2-alpha +VERSION_NAME=1.0.2 GROUP=com.zeoflow.depot POM_DESCRIPTION=The Depot persistence library provides an abstraction layer over SQLite to allow for more robust database access while using the full power of SQLite. POM_URL=https://github.com/zeoflow/depot @@ -39,3 +39,8 @@ POM_DEVELOPER_NAME=ZeoFlow POM_DEVELOPER_EMAIL=open-source@zeoflow.com # sonatype elements +mavenCentralUsername= +mavenCentralPassword= +signing.keyId= +signing.password= +signing.secretKeyRingFile=../buildSrc/key.gpg diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 49efa31..0845016 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sun May 30 14:41:13 EEST 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME