diff --git a/.github/workflows/autopublish.yml b/.github/workflows/autopublish.yml index f7bf8590..f28fc41a 100644 --- a/.github/workflows/autopublish.yml +++ b/.github/workflows/autopublish.yml @@ -8,9 +8,9 @@ jobs: - uses: actions/setup-java@v1 with: java-version: 1.8 - - name: Fix android 31.0.0 dx + - name: Fix android 32.0.0 dx continue-on-error: true - run: cd /usr/local/lib/android/sdk/build-tools/31.0.0/ && mv d8 dx && cd lib && mv d8.jar dx.jar + run: cd /usr/local/lib/android/sdk/build-tools/32.0.0/ && mv d8 dx && cd lib && mv d8.jar dx.jar - name: Rewrite version run: | branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`" diff --git a/features/posts/server/src/jvmMain/kotlin/dev/inmo/postssystem/features/posts/server/ServerPostsStorage.kt b/features/posts/server/src/jvmMain/kotlin/dev/inmo/postssystem/features/posts/server/ServerPostsStorage.kt new file mode 100644 index 00000000..0bdc6e87 --- /dev/null +++ b/features/posts/server/src/jvmMain/kotlin/dev/inmo/postssystem/features/posts/server/ServerPostsStorage.kt @@ -0,0 +1,6 @@ +package dev.inmo.postssystem.features.posts.server + +import dev.inmo.micro_utils.repos.CRUDRepo +import dev.inmo.postssystem.features.posts.common.* + +interface ServerPostsStorage : ServerReadPostsStorage, ServerWritePostsStorage, CRUDRepo diff --git a/features/posts/server/src/jvmMain/kotlin/dev/inmo/postssystem/features/posts/server/ServerReadPostsStorage.kt b/features/posts/server/src/jvmMain/kotlin/dev/inmo/postssystem/features/posts/server/ServerReadPostsStorage.kt new file mode 100644 index 00000000..de8e937d --- /dev/null +++ b/features/posts/server/src/jvmMain/kotlin/dev/inmo/postssystem/features/posts/server/ServerReadPostsStorage.kt @@ -0,0 +1,7 @@ +package dev.inmo.postssystem.features.posts.server + +import dev.inmo.micro_utils.repos.ReadCRUDRepo +import dev.inmo.postssystem.features.posts.common.PostId +import dev.inmo.postssystem.features.posts.common.RegisteredPost + +interface ServerReadPostsStorage : ReadCRUDRepo diff --git a/features/posts/server/src/jvmMain/kotlin/dev/inmo/postssystem/features/posts/server/ServerWritePostsStorage.kt b/features/posts/server/src/jvmMain/kotlin/dev/inmo/postssystem/features/posts/server/ServerWritePostsStorage.kt new file mode 100644 index 00000000..fd21c41d --- /dev/null +++ b/features/posts/server/src/jvmMain/kotlin/dev/inmo/postssystem/features/posts/server/ServerWritePostsStorage.kt @@ -0,0 +1,6 @@ +package dev.inmo.postssystem.features.posts.server + +import dev.inmo.micro_utils.repos.WriteCRUDRepo +import dev.inmo.postssystem.features.posts.common.* + +interface ServerWritePostsStorage : WriteCRUDRepo diff --git a/gradle.properties b/gradle.properties index efa1054c..aad3821d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,7 +13,7 @@ kotlin_version=1.5.31 kotlin_serialisation_core_version=1.3.1 koin_version=3.1.2 -microutils_version=0.8.5 +microutils_version=0.8.7 ktor_version=1.6.5 logback_version=1.2.6 uuid_version=0.3.1 @@ -32,8 +32,8 @@ materialDesignLite=1.3.0 # ANDROID android_minSdkVersion=21 -android_compileSdkVersion=31 -android_buildToolsVersion=31.0.0 +android_compileSdkVersion=32 +android_buildToolsVersion=32.0.0 dexcount_version=3.0.0 junit_version=4.12 test_ext_junit_version=1.1.2 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1d690b12..62c0cb2d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,4 +1,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip zipStoreBase=GRADLE_USER_HOME