From 0266bf9cf6de7851c7b5778c5496131e541b818c Mon Sep 17 00:00:00 2001 From: gaojianming108 Date: Sun, 26 Sep 2021 09:39:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9readme,changelog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + CHANGELOG.md | 3 +++ README.md | 20 ++++++++++---------- build.gradle | 10 +++++----- contentprovider-annotations/build.gradle | 1 + contentprovider/build.gradle | 4 +++- entry/build.gradle | 9 +++------ lib/build.gradle | 3 ++- livedata/build.gradle | 2 +- paging/build.gradle | 2 +- processor/build.gradle | 2 +- reactive-streams/build.gradle | 2 +- sqlcipher/build.gradle | 2 +- 13 files changed, 33 insertions(+), 28 deletions(-) diff --git a/.gitignore b/.gitignore index c2892a18..e4ea5a1e 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ .externalNativeBuild /entry/.preview .cxx +upload.gradle diff --git a/CHANGELOG.md b/CHANGELOG.md index 540e9696..ef6fe3ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 1.0.0 +* 发布正式版本1.0.0 + ## 0.0.1-SNAPSHOT * ohos 第一个版本 diff --git a/README.md b/README.md index 1ef6ebc2..3f344fea 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ - 功能：DBFlow是一个快速、高效、功能丰富数据库组件 - 项目移植状态：主功能完成 - 调用差异：无 -- 开发版本：sdk6，DevEco Studio 2.2 Beta1 +- 开发版本：sdk6，DevEco Studio 2.2 Beta2 - 基线版本：Releases 4.2.4 #### 安装教程 @@ -17,7 +17,7 @@ allprojects { repositories { maven { - url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' + url 'https://s01.oss.sonatype.org/content/repositories/releases/' } } } @@ -27,17 +27,17 @@ allprojects { ``` dependencies { - implementation('com.gitee.chinasoft_ohos:DBFlow_lib:0.0.1-SNAPSHOT') - implementation('com.gitee.chinasoft_ohos:DBFlow_sqlcipher:0.0.1-SNAPSHOT') - implementation('com.gitee.chinasoft_ohos:DBFlow_reactive-streams:0.0.1-SNAPSHOT') - implementation('com.gitee.chinasoft_ohos:DBFlow_contentprovider:0.0.1-SNAPSHOT') - implementation('com.gitee.chinasoft_ohos:DBFlow_paging:0.0.1-SNAPSHOT') - implementation('com.gitee.chinasoft_ohos:DBFlow_livedata:0.0.1-SNAPSHOT') + implementation('com.gitee.chinasoft_ohos:DBFlow_lib:1.0.0') + implementation('com.gitee.chinasoft_ohos:DBFlow_sqlcipher:1.0.0') + implementation('com.gitee.chinasoft_ohos:DBFlow_reactive-streams:1.0.0') + implementation('com.gitee.chinasoft_ohos:DBFlow_contentprovider:1.0.0') + implementation('com.gitee.chinasoft_ohos:DBFlow_paging:1.0.0') + implementation('com.gitee.chinasoft_ohos:DBFlow_livedata:1.0.0') ...... } ``` -在sdk6，DevEco Studio 2.2 Beta1下项目可直接运行 +在sdk6，DevEco Studio 2.2 Beta2下项目可直接运行 如无法运行，删除项目.gradle,.idea,build,gradle,build.gradle文件， 并依据自己的版本创建新项目，将新项目的对应文件复制到根目录下 @@ -151,7 +151,7 @@ CloudTest代码测试无异常 #### 版本迭代 -- 0.0.1-SNAPSHOT +- 1.0.0 #### 版权和许可信息 Copyright (c) 2014 Raizlabs diff --git a/build.gradle b/build.gradle index 6d805404..f24cf448 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.huawei.ohos.app' ohos { - compileSdkVersion 6 + compileSdkVersion 5 defaultConfig { compatibleSdkVersion 5 } @@ -17,13 +17,13 @@ buildscript { url 'https://developer.huawei.com/repo/' } maven { - url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' + url 'https://s01.oss.sonatype.org/content/repositories/releases/' } jcenter() } dependencies { - classpath 'com.huawei.ohos:hap:2.4.5.0' - classpath 'com.huawei.ohos:decctest:1.2.4.1' + classpath 'com.huawei.ohos:hap:2.4.5.5' + classpath 'com.huawei.ohos:decctest:1.2.5.1' classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.21' } @@ -38,7 +38,7 @@ allprojects { url 'https://developer.huawei.com/repo/' } maven { - url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' + url 'https://s01.oss.sonatype.org/content/repositories/releases/' } jcenter() maven { url "https://jitpack.io" } // 添加 diff --git a/contentprovider-annotations/build.gradle b/contentprovider-annotations/build.gradle index e004e72b..33915667 100644 --- a/contentprovider-annotations/build.gradle +++ b/contentprovider-annotations/build.gradle @@ -4,6 +4,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) api(project(":core")) + } sourceCompatibility = "1.8" diff --git a/contentprovider/build.gradle b/contentprovider/build.gradle index 942ce854..9221c9b3 100644 --- a/contentprovider/build.gradle +++ b/contentprovider/build.gradle @@ -1,7 +1,8 @@ apply plugin: 'com.huawei.ohos.library' + //For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#ZH-CN_TOPIC_0000001154985555__section1112183053510 ohos { - compileSdkVersion 6 + compileSdkVersion 5 defaultConfig { compatibleSdkVersion 5 } @@ -22,4 +23,5 @@ dependencies { api(project(":lib")) api(project(":contentprovider-annotations")) + } diff --git a/entry/build.gradle b/entry/build.gradle index caa86cff..a6d2964a 100644 --- a/entry/build.gradle +++ b/entry/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.huawei.ohos.hap' apply plugin: 'com.huawei.ohos.decctest' ohos { - compileSdkVersion 6 + compileSdkVersion 5 defaultConfig { compatibleSdkVersion 5 } @@ -33,11 +33,8 @@ dependencies { implementation(project(":paging")) implementation(project(":livedata")) -// implementation(project(":processor")) -// annotationProcessor(project(":processor")) - - //ohosTestAnnotationProcessor(project(":processor")) - //ohosTestImplementation(project(":processor")) + ohosTestAnnotationProcessor(project(":processor")) + ohosTestImplementation(project(":processor")) testImplementation 'org.mockito:mockito-core:3.+' ohosTestImplementation 'org.mockito:mockito-core:3.+' diff --git a/lib/build.gradle b/lib/build.gradle index 95216c61..c63cf5df 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -1,6 +1,7 @@ apply plugin: 'com.huawei.ohos.library' + ohos { - compileSdkVersion 6 + compileSdkVersion 5 defaultConfig { compatibleSdkVersion 5 } diff --git a/livedata/build.gradle b/livedata/build.gradle index 79c8d27a..ef62e9ed 100644 --- a/livedata/build.gradle +++ b/livedata/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.huawei.ohos.library' //For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#ZH-CN_TOPIC_0000001154985555__section1112183053510 ohos { - compileSdkVersion 6 + compileSdkVersion 5 defaultConfig { compatibleSdkVersion 5 } diff --git a/paging/build.gradle b/paging/build.gradle index 79c8d27a..ef62e9ed 100644 --- a/paging/build.gradle +++ b/paging/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.huawei.ohos.library' //For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#ZH-CN_TOPIC_0000001154985555__section1112183053510 ohos { - compileSdkVersion 6 + compileSdkVersion 5 defaultConfig { compatibleSdkVersion 5 } diff --git a/processor/build.gradle b/processor/build.gradle index 9871ba4c..b0bb6a45 100644 --- a/processor/build.gradle +++ b/processor/build.gradle @@ -4,7 +4,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) testImplementation 'junit:junit:4.13' compileOnly('org.glassfish:javax.annotation:10.0-b28') - compile 'com.squareup:javapoet:1.11.1' + api 'com.squareup:javapoet:1.11.1' api project(path: ':core') api project(path: ':contentprovider-annotations') diff --git a/reactive-streams/build.gradle b/reactive-streams/build.gradle index 04582079..0771fa75 100644 --- a/reactive-streams/build.gradle +++ b/reactive-streams/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.huawei.ohos.library' //For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#ZH-CN_TOPIC_0000001154985555__section1112183053510 ohos { - compileSdkVersion 6 + compileSdkVersion 5 defaultConfig { compatibleSdkVersion 5 } diff --git a/sqlcipher/build.gradle b/sqlcipher/build.gradle index 6810f7f3..6af2f6dc 100644 --- a/sqlcipher/build.gradle +++ b/sqlcipher/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.huawei.ohos.library' //For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#ZH-CN_TOPIC_0000001154985555__section1112183053510 ohos { - compileSdkVersion 6 + compileSdkVersion 5 defaultConfig { compatibleSdkVersion 5 } -- Gitee