diff --git a/.gitignore b/.gitignore index c2892a188e06ba15c0e0ef3ee3d8eb81f2d42dd9..e4ea5a1ebdc69399ec8e72608d8d1e9cd86fc22d 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ .externalNativeBuild /entry/.preview .cxx +upload.gradle diff --git a/CHANGELOG.md b/CHANGELOG.md index 540e96967ce870481510e1befa447d3b8ab49ef2..ef6fe3ffdbe0f0883b526e7b048cd868fea74d64 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 1ef6ebc2e1e2c5d4d7626980e68466d4fd70dc36..3f344fea3883b0ac9581264f005ed65717949ae8 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 6d8054049656387c682ba135ea50824c1750dc07..f24cf448f3b472dac25b3136cee06639ae9ffa0d 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 e004e72bd3a00eb944194c6e6cfe2a6e74d940e1..33915667977f2327584aba36cf140029a0246f29 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 942ce854ca58f4cdcce097cb65e5ced3b2ba9418..9221c9b3b5f4a94fda0f77c99100e539cd0bdcf1 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 caa86cffacd5a66b848f78f37bb97066c0705768..a6d2964a98e9594b9178a33395ac5e5fab19fe32 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 95216c6125e48b9241c3d96141ef1b2844421da1..c63cf5dfbc85f75d9fa7acd46ac88473b5dbf368 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 79c8d27a0ec3eb45519a6ac25d3baf44f9c5d871..ef62e9ed946eb6c6a7e799f989ec1a963ba67afb 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 79c8d27a0ec3eb45519a6ac25d3baf44f9c5d871..ef62e9ed946eb6c6a7e799f989ec1a963ba67afb 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 9871ba4cae09f443b86ac56582bef04397ea8dfc..b0bb6a45fc1ef57538dec1f2e20396fd53d0d93c 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 0458207967227dfd86c0ea77c90b48c6d934da31..0771fa75fc048a93a838ecb0c665d929494019b0 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 6810f7f38b2235351447decd2bd8ae0cd8ba1b6b..6af2f6dca2e9ba7f399b8b73dd171a822f4a4f9e 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 }