Skip to content

Commit

Permalink
Merge pull request #113 from xcesco/v8.x
Browse files Browse the repository at this point in the history 
V8.x
  • Loading branch information
@xcesco
xcesco committed May 12, 2022
2 parents f116a00 + 05b972f commit 00bb0e8
Show file tree
Hide file tree
Showing 22 changed files with 255 additions and 239 deletions.
2 changes: 2 additions & 0 deletions buildDeployAll.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/bin/bash
mvn clean deploy -Prelease,deploy -Dmaven.test.skip=true
4 changes: 2 additions & 2 deletions kripton-android-core/pom.xml
View file
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>8.0.0-rc.3</version>
<version>8.0.0-rc.4</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>8.0.0-rc.3</kripton.version>
<kripton.version>8.0.0-rc.4</kripton.version>

<!-- dependencies version -->
<jackson.version>2.11.2</jackson.version>
Expand Down
327 changes: 163 additions & 164 deletions kripton-android-library/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,169 +7,168 @@
KIND, either express or implied. See the License for the specific language
governing permissions and limitations under the License. -->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.abubusoft</groupId>
<artifactId>kripton-parent</artifactId>
<version>8.0.0-rc.3</version>
<relativePath>../kripton-parent/pom.xml</relativePath>
</parent>

<name>Kripton Android Library</name>


<artifactId>kripton-android-library</artifactId>
<packaging>jar</packaging>

<description>Kripton Persistence Library for Android platform</description>

<properties>
<!-- reactive -->
<rx.version>2.2.19</rx.version>
<reactive.version>1.0.3</reactive.version>

<kripton.version>8.0.0-rc.3</kripton.version>
<robolectric.version>3.1.4</robolectric.version>
<junit.version>4.13.1</junit.version>
<unitils.version>3.4.2</unitils.version>
</properties>

<!-- common part - END -->
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
<configuration>
<systemPropertyVariables>
<kripton.debug>${kripton.debug}</kripton.debug>
</systemPropertyVariables>
<includes>
<include>all/*TestSuite.java</include>
</includes>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>

<dependency>
<groupId>com.abubusoft</groupId>
<artifactId>kripton</artifactId>
<version>${kripton.version}</version>
</dependency>

<dependency>
<groupId>com.abubusoft</groupId>
<artifactId>kripton-orm</artifactId>
<version>${kripton.version}</version>
</dependency>

<dependency>
<groupId>com.abubusoft</groupId>
<artifactId>kripton-shared-preferences</artifactId>
<version>${kripton.version}</version>
</dependency>

<dependency>
<groupId>com.abubusoft</groupId>
<artifactId>kripton-retrofit-converter</artifactId>
<version>${kripton.version}</version>
</dependency>

<!-- RX dependencies - BEGIN -->
<dependency>
<groupId>io.reactivex.rxjava2</groupId>
<artifactId>rxjava</artifactId>
<version>${rx.version}</version>
<scope>provided</scope>
</dependency>

<!-- https://mvnrepository.com/artifact/org.reactivestreams/reactive-streams -->
<dependency>
<groupId>org.reactivestreams</groupId>
<artifactId>reactive-streams</artifactId>
<version>${reactive.version}</version>
<scope>provided</scope>
</dependency>
<!-- RX dependencies - END -->


<dependency>
<groupId>com.abubusoft</groupId>
<artifactId>kripton-arch-integration</artifactId>
<version>${kripton.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.abubusoft</groupId>
<artifactId>kripton-arch-test</artifactId>
<version>${kripton.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.robolectric</groupId>
<artifactId>robolectric</artifactId>
<version>${robolectric.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.robolectric</groupId>
<artifactId>android-all</artifactId>
<version>5.0.0_r2-robolectric-0</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.google.android</groupId>
<artifactId>android</artifactId>
<version>4.1.1.4</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.google.android</groupId>
<artifactId>support-v4</artifactId>
<version>r7</version>
<scope>provided</scope>
</dependency>

<!-- TEST DEPENDENCIES -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.unitils</groupId>
<artifactId>unitils-core</artifactId>
<version>${unitils.version}</version>
<exclusions>
<exclusion>
<artifactId>junit</artifactId>
<groupId>junit</groupId>
</exclusion>
</exclusions>
<scope>test</scope>
</dependency>

<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.7</version>
<scope>test</scope>
</dependency>

</dependencies>
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.abubusoft</groupId>
<artifactId>kripton-parent</artifactId>
<version>8.0.0-rc.4</version>
<relativePath>../kripton-parent/pom.xml</relativePath>
</parent>

<name>Kripton Android Library</name>

<artifactId>kripton-android-library</artifactId>
<packaging>jar</packaging>

<description>Kripton Persistence Library for Android platform</description>

<properties>
<!-- reactive -->
<rx.version>2.2.19</rx.version>
<reactive.version>1.0.3</reactive.version>

<kripton.version>8.0.0-rc.4</kripton.version>
<robolectric.version>3.1.4</robolectric.version>
<junit.version>4.13.1</junit.version>
<unitils.version>3.4.2</unitils.version>
</properties>

<!-- common part - END -->
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
<configuration>
<systemPropertyVariables>
<kripton.debug>${kripton.debug}</kripton.debug>
</systemPropertyVariables>
<includes>
<include>all/*TestSuite.java</include>
</includes>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>

<dependency>
<groupId>com.abubusoft</groupId>
<artifactId>kripton</artifactId>
<version>${kripton.version}</version>
</dependency>

<dependency>
<groupId>com.abubusoft</groupId>
<artifactId>kripton-orm</artifactId>
<version>${kripton.version}</version>
</dependency>

<dependency>
<groupId>com.abubusoft</groupId>
<artifactId>kripton-shared-preferences</artifactId>
<version>${kripton.version}</version>
</dependency>

<dependency>
<groupId>com.abubusoft</groupId>
<artifactId>kripton-retrofit-converter</artifactId>
<version>${kripton.version}</version>
</dependency>

<!-- RX dependencies - BEGIN -->
<dependency>
<groupId>io.reactivex.rxjava2</groupId>
<artifactId>rxjava</artifactId>
<version>${rx.version}</version>
<scope>provided</scope>
</dependency>

<!-- https://mvnrepository.com/artifact/org.reactivestreams/reactive-streams -->
<dependency>
<groupId>org.reactivestreams</groupId>
<artifactId>reactive-streams</artifactId>
<version>${reactive.version}</version>
<scope>provided</scope>
</dependency>
<!-- RX dependencies - END -->


<dependency>
<groupId>com.abubusoft</groupId>
<artifactId>kripton-arch-integration</artifactId>
<version>${kripton.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.abubusoft</groupId>
<artifactId>kripton-arch-test</artifactId>
<version>${kripton.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.robolectric</groupId>
<artifactId>robolectric</artifactId>
<version>${robolectric.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.robolectric</groupId>
<artifactId>android-all</artifactId>
<version>5.0.0_r2-robolectric-0</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.google.android</groupId>
<artifactId>android</artifactId>
<version>4.1.1.4</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.google.android</groupId>
<artifactId>support-v4</artifactId>
<version>r7</version>
<scope>provided</scope>
</dependency>

<!-- TEST DEPENDENCIES -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.unitils</groupId>
<artifactId>unitils-core</artifactId>
<version>${unitils.version}</version>
<exclusions>
<exclusion>
<artifactId>junit</artifactId>
<groupId>junit</groupId>
</exclusion>
</exclusions>
<scope>test</scope>
</dependency>

<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.7</version>
<scope>test</scope>
</dependency>

</dependencies>

</project>
16 changes: 8 additions & 8 deletions ...id-library/src/test/java/sqlite/feature/many2many/err3/BindPersonCirtyErr3DataSource.java
View file
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

0 comments on commit 00bb0e8

Please sign in to comment.