Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Events dirty field and android studio 3.1.3 port #18

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.gradle_version = "3.1.3"
repositories {
mavenCentral()
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.2.3'
classpath "com.android.tools.build:gradle:$gradle_version"

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}

allprojects {
ext.gradle_version = "3.1.3"
repositories {
mavenCentral()
google()
jcenter()
}
}
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Aug 13 22:44:34 IDT 2015
#Sun Jul 01 20:23:18 CEST 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
17 changes: 8 additions & 9 deletions providers-android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 22
buildToolsVersion "22.0.1"
compileSdkVersion 28

defaultConfig {
minSdkVersion 14
targetSdkVersion 22
targetSdkVersion 28
versionCode 1
versionName "1.0"
}
Expand Down Expand Up @@ -42,21 +41,21 @@ ext {
allLicenses = ["Apache-2.0"]
}

apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'
apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle'
apply plugin: 'com.jfrog.bintray'

buildscript {
repositories {
mavenCentral()
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.0.0'
classpath "com.android.tools.build:gradle:$gradle_version"
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
classpath 'com.github.dcendents:android-maven-plugin:1.2'
}
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'me.everything:providers-core:1.0.0'
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation project(':providers-core')
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,9 @@ public class Event extends Entity {

@FieldMapping(columnName = Events.ORIGINAL_SYNC_ID, physicalType = FieldMapping.PhysicalType.String)
public String originalSyncId;

@FieldMapping(columnName = Events.DIRTY, physicalType = FieldMapping.PhysicalType.Long)
public long dirty;

@FieldMapping(columnName = Events.RDATE, physicalType = FieldMapping.PhysicalType.String)
public String rDate;
Expand Down
13 changes: 6 additions & 7 deletions providers-core/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 22
buildToolsVersion "22.0.1"
compileSdkVersion 28

defaultConfig {
minSdkVersion 14
targetSdkVersion 22
targetSdkVersion 28
versionCode 1
versionName "1.0"
}
Expand Down Expand Up @@ -42,16 +41,16 @@ ext {
allLicenses = ["Apache-2.0"]
}

apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'
apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle'
apply plugin: 'com.jfrog.bintray'

buildscript {
repositories {
mavenCentral()
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.0.0'
classpath "com.android.tools.build:gradle:$gradle_version"
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
classpath 'com.github.dcendents:android-maven-plugin:1.2'
}
}

This file was deleted.

2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include ':app', ':providers-core', ':providers-android', ':providers-stetho'
include ':providers-core', ':providers-android'