diff --git a/build.gradle b/build.gradle index 9405f3f..b068fb2 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,14 @@ // 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 @@ -13,7 +16,10 @@ buildscript { } allprojects { + ext.gradle_version = "3.1.3" repositories { + mavenCentral() + google() jcenter() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9b3b850..eefde14 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/providers-android/build.gradle b/providers-android/build.gradle index a182f57..5d3a936 100644 --- a/providers-android/build.gradle +++ b/providers-android/build.gradle @@ -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" } @@ -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') } diff --git a/providers-android/src/androidTest/java/me/everything/providers/android/ApplicationTest.java b/providers-android/src/androidTest/java/me/everything/providers/android/ApplicationTest.java deleted file mode 100644 index 1d9712c..0000000 --- a/providers-android/src/androidTest/java/me/everything/providers/android/ApplicationTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package me.everything.providers.android; - -import android.app.Application; -import android.test.ApplicationTestCase; - -/** - * Testing Fundamentals - */ -public class ApplicationTest extends ApplicationTestCase { - public ApplicationTest() { - super(Application.class); - } -} \ No newline at end of file diff --git a/providers-android/src/main/java/me/everything/providers/android/browser/Bookmark.java b/providers-android/src/main/java/me/everything/providers/android/browser/Bookmark.java deleted file mode 100644 index 89e1b4a..0000000 --- a/providers-android/src/main/java/me/everything/providers/android/browser/Bookmark.java +++ /dev/null @@ -1,36 +0,0 @@ -package me.everything.providers.android.browser; - -import android.net.Uri; -import android.provider.Browser; -import android.provider.Browser.BookmarkColumns; - -import me.everything.providers.core.Entity; -import me.everything.providers.core.FieldMapping; -import me.everything.providers.core.IgnoreMapping; - -public class Bookmark extends Entity { - - @IgnoreMapping - public static Uri uri = Browser.BOOKMARKS_URI; - - @FieldMapping(columnName = BookmarkColumns.BOOKMARK, physicalType = FieldMapping.PhysicalType.Int) - public int bookmark; - - @FieldMapping(columnName = BookmarkColumns.CREATED, physicalType = FieldMapping.PhysicalType.Long) - public long created; - - @FieldMapping(columnName = BookmarkColumns.DATE, physicalType = FieldMapping.PhysicalType.Long) - public long date; - - @FieldMapping(columnName = BookmarkColumns.FAVICON, physicalType = FieldMapping.PhysicalType.Blob) - public byte[] favicon; - - @FieldMapping(columnName = BookmarkColumns.TITLE, physicalType = FieldMapping.PhysicalType.String) - public String title; - - @FieldMapping(columnName = BookmarkColumns.URL, physicalType = FieldMapping.PhysicalType.String) - public String url; - - @FieldMapping(columnName = BookmarkColumns.VISITS, physicalType = FieldMapping.PhysicalType.Int) - public int visits; -} diff --git a/providers-android/src/main/java/me/everything/providers/android/browser/BrowserProvider.java b/providers-android/src/main/java/me/everything/providers/android/browser/BrowserProvider.java deleted file mode 100644 index c425373..0000000 --- a/providers-android/src/main/java/me/everything/providers/android/browser/BrowserProvider.java +++ /dev/null @@ -1,24 +0,0 @@ -package me.everything.providers.android.browser; - -import android.content.Context; - -import me.everything.providers.core.AbstractProvider; -import me.everything.providers.core.Data; - -public class BrowserProvider extends AbstractProvider { - - public BrowserProvider(Context context) { - super(context); - } - - public Data getBookmarks() { - Data bookmarks = getContentTableData(Bookmark.uri, Bookmark.class); - return bookmarks; - } - - public Data getSearches() { - Data searches = getContentTableData(Search.uri, Search.class); - return searches; - } - -} diff --git a/providers-android/src/main/java/me/everything/providers/android/browser/Search.java b/providers-android/src/main/java/me/everything/providers/android/browser/Search.java deleted file mode 100644 index 55fc44f..0000000 --- a/providers-android/src/main/java/me/everything/providers/android/browser/Search.java +++ /dev/null @@ -1,22 +0,0 @@ -package me.everything.providers.android.browser; - -import android.net.Uri; -import android.provider.Browser; -import android.provider.Browser.SearchColumns; - -import me.everything.providers.core.Entity; -import me.everything.providers.core.FieldMapping; -import me.everything.providers.core.IgnoreMapping; - -public class Search extends Entity { - - @IgnoreMapping - public static Uri uri = Browser.SEARCHES_URI; - - @FieldMapping(columnName = SearchColumns.SEARCH, physicalType = FieldMapping.PhysicalType.String) - public String search; - - @FieldMapping(columnName = SearchColumns.DATE, physicalType = FieldMapping.PhysicalType.Long) - public long date; - -} diff --git a/providers-android/src/main/java/me/everything/providers/android/calendar/Event.java b/providers-android/src/main/java/me/everything/providers/android/calendar/Event.java index 04bbe31..ac1f03f 100644 --- a/providers-android/src/main/java/me/everything/providers/android/calendar/Event.java +++ b/providers-android/src/main/java/me/everything/providers/android/calendar/Event.java @@ -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; diff --git a/providers-core/build.gradle b/providers-core/build.gradle index 60d0702..06f9667 100644 --- a/providers-core/build.gradle +++ b/providers-core/build.gradle @@ -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" } @@ -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' } } diff --git a/providers-core/src/androidTest/java/me/everything/providers/core/ApplicationTest.java b/providers-core/src/androidTest/java/me/everything/providers/core/ApplicationTest.java deleted file mode 100644 index ff6b4c2..0000000 --- a/providers-core/src/androidTest/java/me/everything/providers/core/ApplicationTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package me.everything.providers.core; - -import android.app.Application; -import android.test.ApplicationTestCase; - -/** - * Testing Fundamentals - */ -public class ApplicationTest extends ApplicationTestCase { - public ApplicationTest() { - super(Application.class); - } -} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 917ca5d..8ca296e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':app', ':providers-core', ':providers-android', ':providers-stetho' +include ':providers-core', ':providers-android'