Skip to content

Commit

Permalink
Merge pull request #88 from xcesco/v7.x
Browse files Browse the repository at this point in the history
V7.x
  • Loading branch information
xcesco committed Dec 29, 2020
2 parents 46ff87d + 318fa0b commit 124f07b
Show file tree
Hide file tree
Showing 21 changed files with 46 additions and 46 deletions.
4 changes: 2 additions & 2 deletions kripton-android-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<parent>
<groupId>com.abubusoft</groupId>
<artifactId>kripton-parent</artifactId>
<version>7.0.0-rc.9</version>
<version>7.0.0</version>
<relativePath>../kripton-parent/pom.xml</relativePath>
</parent>

Expand All @@ -25,7 +25,7 @@
<description>Kripton Persistence Library for Android platform - core module for android modules</description>

<properties>
<kripton.version>7.0.0-rc.9</kripton.version>
<kripton.version>7.0.0</kripton.version>

<!-- dependencies version -->
<jackson.version>2.11.2</jackson.version>
Expand Down
4 changes: 2 additions & 2 deletions kripton-android-library/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>com.abubusoft</groupId>
<artifactId>kripton-parent</artifactId>
<version>7.0.0-rc.9</version>
<version>7.0.0</version>
<relativePath>../kripton-parent/pom.xml</relativePath>
</parent>

Expand All @@ -31,7 +31,7 @@
<rx.version>2.2.19</rx.version>
<reactive.version>1.0.3</reactive.version>

<kripton.version>7.0.0-rc.9</kripton.version>
<kripton.version>7.0.0</kripton.version>
<robolectric.version>3.1.4</robolectric.version>
<junit.version>4.13.1</junit.version>
<unitils.version>3.4.2</unitils.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,11 @@ public static Thumbnail parseThumbnail(byte[] input) {
JsonParser jacksonParser=wrapper.jacksonParser;
// START_OBJECT
jacksonParser.nextToken();
Thumbnail result=null;
Thumbnail __thumbnail=null;
if (jacksonParser.currentToken()==JsonToken.START_OBJECT) {
result=thumbnailBindMap.parseOnJackson(jacksonParser);
__thumbnail=thumbnailBindMap.parseOnJackson(jacksonParser);
}
return result;
return __thumbnail;
} catch(Exception e) {
e.printStackTrace();
throw(new KriptonRuntimeException(e.getMessage()));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,11 @@ public static Image parseImage(byte[] input) {
JsonParser jacksonParser=wrapper.jacksonParser;
// START_OBJECT
jacksonParser.nextToken();
Image result=null;
Image __image=null;
if (jacksonParser.currentToken()==JsonToken.START_OBJECT) {
result=imageBindMap.parseOnJackson(jacksonParser);
__image=imageBindMap.parseOnJackson(jacksonParser);
}
return result;
return __image;
} catch(Exception e) {
e.printStackTrace();
throw(new KriptonRuntimeException(e.getMessage()));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -330,16 +330,16 @@ protected void onCreate(SupportSQLiteDatabase database) {
// log section create END
// log section create BEGIN
if (this.logEnabled) {
Logger.info("DDL: %s",PersonTable.CREATE_TABLE_SQL);
Logger.info("DDL: %s",CityTable.CREATE_TABLE_SQL);
}
// log section create END
database.execSQL(PersonTable.CREATE_TABLE_SQL);
database.execSQL(CityTable.CREATE_TABLE_SQL);
// log section create BEGIN
if (this.logEnabled) {
Logger.info("DDL: %s",CityTable.CREATE_TABLE_SQL);
Logger.info("DDL: %s",PersonTable.CREATE_TABLE_SQL);
}
// log section create END
database.execSQL(CityTable.CREATE_TABLE_SQL);
database.execSQL(PersonTable.CREATE_TABLE_SQL);
// log section create BEGIN
if (this.logEnabled) {
Logger.info("DDL: %s",PersonCityErr3Table.CREATE_TABLE_SQL);
Expand Down Expand Up @@ -387,16 +387,16 @@ protected void onUpgrade(SupportSQLiteDatabase database, int previousVersion,
// generate tables
// log section BEGIN
if (this.logEnabled) {
Logger.info("DDL: %s",PersonTable.CREATE_TABLE_SQL);
Logger.info("DDL: %s",CityTable.CREATE_TABLE_SQL);
}
// log section END
database.execSQL(PersonTable.CREATE_TABLE_SQL);
database.execSQL(CityTable.CREATE_TABLE_SQL);
// log section BEGIN
if (this.logEnabled) {
Logger.info("DDL: %s",CityTable.CREATE_TABLE_SQL);
Logger.info("DDL: %s",PersonTable.CREATE_TABLE_SQL);
}
// log section END
database.execSQL(CityTable.CREATE_TABLE_SQL);
database.execSQL(PersonTable.CREATE_TABLE_SQL);
// log section BEGIN
if (this.logEnabled) {
Logger.info("DDL: %s",PersonCityErr3Table.CREATE_TABLE_SQL);
Expand Down
2 changes: 1 addition & 1 deletion kripton-arch-integration/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.abubusoft</groupId>
<artifactId>kripton-parent</artifactId>
<version>7.0.0-rc.9</version>
<version>7.0.0</version>
<relativePath>../kripton-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion kripton-arch-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.abubusoft</groupId>
<artifactId>kripton-parent</artifactId>
<version>7.0.0-rc.9</version>
<version>7.0.0</version>
<relativePath>../kripton-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion kripton-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.abubusoft</groupId>
<artifactId>kripton-parent</artifactId>
<version>7.0.0-rc.9</version>
<version>7.0.0</version>
<relativePath>../kripton-parent/pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions kripton-dataformat-cbor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.abubusoft</groupId>
<artifactId>kripton-parent</artifactId>
<version>7.0.0-rc.9</version>
<version>7.0.0</version>
<relativePath>../kripton-parent/pom.xml</relativePath>
</parent>

Expand All @@ -16,7 +16,7 @@
<packaging>jar</packaging>

<properties>
<kripton.version>7.0.0-rc.9</kripton.version>
<kripton.version>7.0.0</kripton.version>

<!-- dependencies version -->
<jackson.version>2.11.2</jackson.version>
Expand Down
4 changes: 2 additions & 2 deletions kripton-dataformat-properties/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.abubusoft</groupId>
<artifactId>kripton-parent</artifactId>
<version>7.0.0-rc.9</version>
<version>7.0.0</version>
<relativePath>../kripton-parent/pom.xml</relativePath>
</parent>

Expand All @@ -16,7 +16,7 @@
<packaging>jar</packaging>

<properties>
<kripton.version>7.0.0-rc.9</kripton.version>
<kripton.version>7.0.0</kripton.version>

<!-- dependencies version -->
<jackson.version>2.11.2</jackson.version>
Expand Down
4 changes: 2 additions & 2 deletions kripton-dataformat-smile/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<parent>
<groupId>com.abubusoft</groupId>
<artifactId>kripton-parent</artifactId>
<version>7.0.0-rc.9</version>
<version>7.0.0</version>
<relativePath>../kripton-parent/pom.xml</relativePath>
</parent>

<artifactId>kripton-dataformat-smile</artifactId>

<properties>
<kripton.version>7.0.0-rc.9</kripton.version>
<kripton.version>7.0.0</kripton.version>

<!-- dependencies version -->
<jackson.version>2.11.2</jackson.version>
Expand Down
4 changes: 2 additions & 2 deletions kripton-dataformat-yaml/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.abubusoft</groupId>
<artifactId>kripton-parent</artifactId>
<version>7.0.0-rc.9</version>
<version>7.0.0</version>
<relativePath>../kripton-parent/pom.xml</relativePath>
</parent>

Expand All @@ -15,7 +15,7 @@
<packaging>jar</packaging>

<properties>
<kripton.version>7.0.0-rc.9</kripton.version>
<kripton.version>7.0.0</kripton.version>

<!-- dependencies version -->
<jackson.version>2.11.2</jackson.version>
Expand Down
2 changes: 1 addition & 1 deletion kripton-example01/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.abubusoft</groupId>
<artifactId>kripton-parent</artifactId>
<version>7.0.0-rc.9</version>
<version>7.0.0</version>
<relativePath>../kripton-parent/pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions kripton-orm/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.abubusoft</groupId>
<artifactId>kripton-parent</artifactId>
<version>7.0.0-rc.9</version>
<version>7.0.0</version>
<relativePath>../kripton-parent/pom.xml</relativePath>
</parent>

Expand All @@ -16,7 +16,7 @@
<packaging>jar</packaging>

<properties>
<kripton.version>7.0.0-rc.9</kripton.version>
<kripton.version>7.0.0</kripton.version>

<!-- dependencies version -->
<jackson.version>2.11.2</jackson.version>
Expand Down
6 changes: 3 additions & 3 deletions kripton-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<groupId>com.abubusoft</groupId>
<artifactId>kripton-parent</artifactId>
<version>7.0.0-rc.9</version>
<version>7.0.0</version>
<packaging>pom</packaging>

<name>Kripton (Parent)</name>
Expand All @@ -38,7 +38,7 @@
<maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
<maven-source-plugin.version>3.0.1</maven-source-plugin.version>

<kripton.version>7.0.0-rc.9</kripton.version>
<kripton.version>7.0.0</kripton.version>

<!-- dependencies version -->
<jackson.version>2.11.2</jackson.version>
Expand All @@ -51,7 +51,7 @@
<jsr305.version>3.0.1</jsr305.version>
<!-- <guava.version>29.0-jre</guava.version> -->
<robolectric.version>3.1.4</robolectric.version>
<roboletricAndroidAll.version>7.0.0-rc.9_r1-robolectric-0</roboletricAndroidAll.version>
<roboletricAndroidAll.version>7.0.0_r1-robolectric-0</roboletricAndroidAll.version>

<!-- processor libraries -->
<javapoet.version>1.9.0</javapoet.version>
Expand Down
4 changes: 2 additions & 2 deletions kripton-processor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>com.abubusoft</groupId>
<artifactId>kripton-parent</artifactId>
<version>7.0.0-rc.9</version>
<version>7.0.0</version>
<relativePath>../kripton-parent/pom.xml</relativePath>
</parent>

Expand All @@ -26,7 +26,7 @@
<properties>
<skipTests>false</skipTests>

<kripton.version>7.0.0-rc.9</kripton.version>
<kripton.version>7.0.0</kripton.version>

<!-- dependencies version -->
<jackson.version>2.11.2</jackson.version>
Expand Down
4 changes: 2 additions & 2 deletions kripton-retrofit-converter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.abubusoft</groupId>
<artifactId>kripton-parent</artifactId>
<version>7.0.0-rc.9</version>
<version>7.0.0</version>
<relativePath>../kripton-parent/pom.xml</relativePath>
</parent>

Expand All @@ -16,7 +16,7 @@
<properties>
<java.version>1.8</java.version>

<kripton.version>7.0.0-rc.9</kripton.version>
<kripton.version>7.0.0</kripton.version>

<!-- dependencies version -->
<jackson.version>2.11.2</jackson.version>
Expand Down
4 changes: 2 additions & 2 deletions kripton-shared-preferences/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.abubusoft</groupId>
<artifactId>kripton-parent</artifactId>
<version>7.0.0-rc.9</version>
<version>7.0.0</version>
<relativePath>../kripton-parent/pom.xml</relativePath>
</parent>

Expand All @@ -16,7 +16,7 @@
<packaging>jar</packaging>

<properties>
<kripton.version>7.0.0-rc.9</kripton.version>
<kripton.version>7.0.0</kripton.version>

<!-- dependencies version -->
<jackson.version>2.11.2</jackson.version>
Expand Down
4 changes: 2 additions & 2 deletions kripton-sqlite-test-library/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.abubusoft</groupId>
<artifactId>kripton-sqlite-test-library</artifactId>
<version>7.0.0-rc.9</version>
<version>7.0.0</version>

<name>Kripton SQLite Test Library</name>
<description>Kripton SQLite Test Library</description>
Expand All @@ -12,7 +12,7 @@

<!-- Property version 1.6.2-SNAPSHOT -->
<properties>
<kripton.version>7.0.0-rc.9</kripton.version>
<kripton.version>7.0.0</kripton.version>

<!-- environment version -->
<java.version>1.8</java.version>
Expand Down
4 changes: 2 additions & 2 deletions kripton/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>com.abubusoft</groupId>
<artifactId>kripton-parent</artifactId>
<version>7.0.0-rc.9</version>
<version>7.0.0</version>
<relativePath>../kripton-parent/pom.xml</relativePath>
</parent>

Expand All @@ -25,7 +25,7 @@
<description>Kripton Persistence Library</description>

<properties>
<kripton.version>7.0.0-rc.9</kripton.version>
<kripton.version>7.0.0</kripton.version>

<!-- dependencies version -->
<jackson.version>2.11.2</jackson.version>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.abubusoft</groupId>
<artifactId>kripton-parent</artifactId>
<version>7.0.0-rc.9</version>
<version>7.0.0</version>
<relativePath>./kripton-parent/pom.xml</relativePath>
</parent>

Expand Down

0 comments on commit 124f07b

Please sign in to comment.