Skip to content

Commit

Permalink
Merge pull request #13 from zeoflow/env/dependencies
Browse files Browse the repository at this point in the history
Updated environment and targeted SDK
  • Loading branch information
teogor authored Jan 15, 2022
2 parents f62aaf9 + 5abe883 commit ea14ca0
Show file tree
Hide file tree
Showing 15 changed files with 25 additions and 20 deletions.
9 changes: 4 additions & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.Depot">
<activity android:name=".MainActivity">
<activity android:name=".MainActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion dispatcher-compiler/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
}

android {
compileSdk 30
compileSdk 31
defaultConfig {
multiDexEnabled true
}
Expand Down
2 changes: 1 addition & 1 deletion dispatcher-compiler/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="com.zeoflow.depot.dispatcher" />
<manifest package="com.zeoflow.depot.dispatcher.compiler" />
2 changes: 1 addition & 1 deletion dispatcher-runtime/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
}

android {
compileSdk 30
compileSdk 31
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion dispatcher-runtime/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.zeoflow.depot.dispatcher">
package="com.zeoflow.depot.dispatcher.runtime">
<application>
<provider
android:name="com.zeoflow.depot.dispatcher.InitProvider"
Expand Down
7 changes: 6 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
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 @@
#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
2 changes: 1 addition & 1 deletion runtime/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
}

android {
compileSdk 30
compileSdk 31
buildFeatures {
aidl = true
}
Expand Down
4 changes: 2 additions & 2 deletions runtime/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.zeoflow.depot">
package="com.zeoflow.depot.runtime">

<application>
<service
android:name=".MultiInstanceInvalidationService"
android:name="com.zeoflow.depot.MultiInstanceInvalidationService"
android:directBootAware="true"
android:exported="false"/>
</application>
Expand Down
2 changes: 1 addition & 1 deletion sqlite-framework/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
}

android {
compileSdk 30
compileSdk 31
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion sqlite-framework/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<manifest package="com.zeoflow.sqlite.db.framework"/>
<manifest package="com.zeoflow.sqlite.framework"/>
2 changes: 1 addition & 1 deletion sqlite/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ plugins {
}

android {
compileSdk 30
compileSdk 31
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion sqlite/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<manifest package="com.zeoflow.sqlite.db"/>
<manifest package="com.zeoflow.sqlite"/>

0 comments on commit ea14ca0

Please sign in to comment.