Skip to content

Commit

Permalink
android.arch.persistence:db-framework:1.1.0
Browse files Browse the repository at this point in the history 
and others library update
  • Loading branch information
@SelvinPL
SelvinPL committed May 16, 2018
1 parent 3061aa2 commit 2d5c058
Show file tree
Hide file tree
Showing 12 changed files with 75 additions and 57 deletions.
11 changes: 6 additions & 5 deletions auto-content-provider/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ apply from: '../publish.gradle'

android {
compileSdkVersion 27
buildToolsVersion '27.0.3'

defaultConfig {
minSdkVersion 14
Expand All @@ -24,9 +25,9 @@ android {
}

dependencies {
api 'com.android.support:support-annotations:27.0.2'
api 'android.arch.persistence:db:1.0.0'
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
androidTestImplementation 'android.arch.persistence:db-framework:1.0.0'
api 'com.android.support:support-annotations:27.1.1'
api 'android.arch.persistence:db:1.1.0'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
androidTestImplementation 'android.arch.persistence:db-framework:1.1.0'
}
4 changes: 2 additions & 2 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'digital.wup:android-maven-publish:3.1.1'
classpath 'com.android.tools.build:gradle:3.1.2'
classpath 'digital.wup:android-maven-publish:3.3.0'
}
}

Expand Down
5 changes: 2 additions & 3 deletions db-sqlcipher/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ apply from: '../publish.gradle'

android {
compileSdkVersion 27


buildToolsVersion '27.0.3'

defaultConfig {
minSdkVersion 14
Expand All @@ -28,6 +27,6 @@ android {
}

dependencies {
api 'android.arch.persistence:db:1.0.0'
api 'android.arch.persistence:db:1.1.0'
api 'net.zetetic:android-database-sqlcipher:3.5.9'
}
2 changes: 1 addition & 1 deletion db-sqlcipher/src/main/java/pl/selvin/android/db/sqlcipher/BindingsRecorder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public void clearBindings() {
}

@Override
public void close() throws Exception {
public void close() {
clearBindings();
}

Expand Down
2 changes: 1 addition & 1 deletion db-sqlcipher/src/main/java/pl/selvin/android/db/sqlcipher/SqlCipherProgram.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public void clearBindings() {
}

@Override
public void close() throws Exception {
public void close() {
mDelegate.close();
}
}
2 changes: 1 addition & 1 deletion db-sqlcipher/src/main/java/pl/selvin/android/db/sqlcipher/SqlCipherStatement.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public String simpleQueryForString() {
}

@Override
public void close() throws Exception {
public void close() {
mDelegate.close();
}
}
12 changes: 6 additions & 6 deletions demo/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ android {
}
}
compileSdkVersion 27
buildToolsVersion '27.0.0'
buildToolsVersion '27.0.3'
defaultConfig {
applicationId "pl.selvin.android.listsyncsample"
minSdkVersion 14
targetSdkVersion 27
versionCode 9001
versionName "0.9.1"
versionCode 11000
versionName "0.11.0"
}
buildTypes {
release {
Expand Down Expand Up @@ -78,15 +78,15 @@ android {
}
}

def supportV = '27.0.2'
def supportV = '27.1.1'
dependencies {
implementation "com.android.support:appcompat-v7:$supportV"
implementation "com.android.support:design:$supportV"
implementation "com.android.support:recyclerview-v7:$supportV"
implementation 'com.google.code.findbugs:jsr305:3.0.2'
implementation 'com.squareup.okhttp3:okhttp:3.9.1'
implementation 'com.squareup.okhttp3:okhttp:3.10.0'
implementation 'com.google.android:flexbox:0.3.1'
implementation project(':sync-framework')
androidImplementation 'android.arch.persistence:db-framework:1.0.0'
androidImplementation 'android.arch.persistence:db-framework:1.1.0'
cipherImplementation project(':db-sqlcipher')
}
78 changes: 48 additions & 30 deletions demo/themes.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@ import org.apache.commons.text.StrBuilder

class C2M {
final map = [:]

C2M(Closure closure) {
closure.delegate = this
closure()
}

def methodMissing(String name, args) { map[name] = args[0] }
}

Expand All @@ -38,28 +40,36 @@ class ThemesExtension {
outputFile project.file("${this.path}/values/colors.xml")
colorsMap this.colorsMap
}
def generateThemedDrawablesTask = project.task("generate${parentName}ThemedVectorDrawables", type: GenerateThemedVectorDrawable) {
inputDir = project.file("/themed/drawable")
outputDir = project.file("${this.path}/drawable")
colorsMapVector this.colorsMapVector
if (project.file("/themed/drawable").exists()) {
def generateThemedDrawablesTask = project.task("generate${parentName}ThemedVectorDrawables", type: GenerateThemedVectorDrawable) {
inputDir = project.file("/themed/drawable")
outputDir = project.file("${this.path}/drawable")
colorsMapVector this.colorsMapVector
}
generateThemedDrawablesTask.dependsOn(generateColorsTask)
}
generateThemedDrawablesTask.dependsOn(generateColorsTask)
generateTask = project.task("generate${parentName}ThemedMipmaps", type: GenerateThemedMipmapsVectorDrawable) {
inputDir = project.file("/themed/mipmap")
outputDirs = GenerateThemedMipmapsVectorDrawable.sizes.collectEntries{[(it) : project.file("${this.path}/mipmap-${it.getResourceValue()}")]}
colorsMapVector this.colorsMapVector

if (project.file("/themed/mipmap").exists()) {
generateTask = project.task("generate${parentName}ThemedMipmaps", type: GenerateThemedMipmapsVectorDrawable) {
inputDir = project.file("/themed/mipmap")
outputDirs = GenerateThemedMipmapsVectorDrawable.sizes.collectEntries {
[(it): project.file("${this.path}/mipmap-${it.getResourceValue()}")]
}
colorsMapVector this.colorsMapVector
}
generateTask.dependsOn(generateColorsTask)
}
generateTask.dependsOn(generateThemedDrawablesTask)
}

public Map<String, String> colorsMap
public Map<String, String> colorsMapVector

void createTask(variantName) {
if(hasTheme) {
if (hasTheme) {
tasks.findByName("generate${variantName.capitalize()}ResValues").dependsOn(generateTask)
}
}

void setHasTheme() {
if (!parent.getDimension()?.trim()) {
List<String> dim = project.android.getFlavorDimensionList()
Expand All @@ -74,31 +84,35 @@ class ThemesExtension {
sourceSets[parent.name].res.srcDirs(path)
}

static String format(v) { return String.format("#%08X", (v & 0xff000000) == 0 ? (v | 0xff000000) : v) }
static String format(v) {
return String.format("#%08X", (v & 0xff000000) == 0 ? (v | 0xff000000) : v)
}

@SuppressWarnings("GroovyUnusedDeclaration")
def colors(Closure closure) {
new C2M(closure).map.each { k, v -> putToMaps(k, format(v))}
new C2M(closure).map.each { k, v -> putToMaps(k, format(v)) }
setHasTheme()
}

def putToMaps(k, v){
def putToMaps(k, v) {
colorsMap.put(k, v)
colorsMapVector.put("=\"@color/"+ k + "\"", "=\"" + v + "\"")
colorsMapVector.put("=\"@color/" + k + "\"", "=\"" + v + "\"")
}

@SuppressWarnings("GroovyUnusedDeclaration")
def colorsWithAlpha(Closure closure) {
new C2M(closure).map.collectEntries { k, v ->
[(k): format(v)] + (1..9).collectEntries { i ->
[(k + "A" + i + "0"): format(v + ((int) (i * 25.5) * 0x1000000))]
String key = "${k}A${i}0";
[(key): format(v + ((int) (i * 25.5) * 0x1000000))]
}
}.each { k, v -> putToMaps(k, v)}
}.each { k, v -> putToMaps(k, v) }
setHasTheme()
}

}

class GenerateThemedVectorDrawable extends DefaultTask {
class GenerateThemedVectorDrawable extends DefaultTask {
@SkipWhenEmpty
@InputDirectory
@SuppressWarnings("GroovyUnusedDeclaration")
Expand All @@ -108,15 +122,16 @@ class GenerateThemedVectorDrawable extends DefaultTask {
@Input
@SkipWhenEmpty
Map<String, String> colorsMapVector

@SuppressWarnings("GroovyUnusedDeclaration")
@TaskAction
void execute(IncrementalTaskInputs inputs){
void execute(IncrementalTaskInputs inputs) {
if (!inputs.incremental)
project.delete(outputDir.listFiles())
inputs.outOfDate { change ->
def targetFile = project.file("$outputDir/${change.file.name}")
def vector = new StrBuilder(change.file.text)
colorsMapVector.each { n, v -> vector.replaceAll(n, v) }
colorsMapVector.each { n, v -> vector.replaceAll(n, v) }
targetFile.text = vector.toString()
}
inputs.removed { change ->
Expand All @@ -128,8 +143,9 @@ class GenerateThemedVectorDrawable extends DefaultTask {
}
}

class GenerateThemedMipmapsVectorDrawable extends DefaultTask {
public static final def sizes = [ Density.MEDIUM, Density.HIGH, Density.XHIGH, Density.XXHIGH, Density.XXXHIGH ]
class GenerateThemedMipmapsVectorDrawable extends DefaultTask {
public static final
def sizes = [Density.MEDIUM, Density.HIGH, Density.XHIGH, Density.XXHIGH, Density.XXXHIGH]
@SkipWhenEmpty
@InputDirectory
@SuppressWarnings("GroovyUnusedDeclaration")
Expand All @@ -139,14 +155,15 @@ class GenerateThemedMipmapsVectorDrawable extends DefaultTask {
@Input
@SkipWhenEmpty
Map<String, String> colorsMapVector

@SuppressWarnings("GroovyUnusedDeclaration")
@TaskAction
void execute(IncrementalTaskInputs inputs){
void execute(IncrementalTaskInputs inputs) {
if (!inputs.incremental)
outputDirs.each{project.delete(it.getValue())}
outputDirs.each { project.delete(it.getValue()) }
inputs.outOfDate { change ->
def vector = new StrBuilder(change.file.text)
colorsMapVector.each { n, v -> vector.replaceAll(n, v) }
colorsMapVector.each { n, v -> vector.replaceAll(n, v) }
outputDirs.each {
float scaleFactor = it.getKey().getDpiValue() / (float) Density.MEDIUM.getDpiValue()
if (scaleFactor <= 0) {
Expand All @@ -162,7 +179,7 @@ class GenerateThemedMipmapsVectorDrawable extends DefaultTask {
inputs.removed { change ->
outputDirs.each {
def file = project.file("${it.getValue()}/${change.file.name.replace(".xml", ".png")}")
if(file.exists())
if (file.exists())
file.delete()
}
}
Expand All @@ -176,9 +193,10 @@ class GenerateColors extends DefaultTask {
@Input
@SkipWhenEmpty
Map<String, String> colorsMap

@SuppressWarnings("GroovyUnusedDeclaration")
@TaskAction
void execute(IncrementalTaskInputs inputs){
void execute(IncrementalTaskInputs inputs) {
def docBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder()
def doc = docBuilder.newDocument()
def resources = doc.createElement('resources')
Expand All @@ -189,7 +207,7 @@ class GenerateColors extends DefaultTask {
color.appendChild(doc.createTextNode(v))
resources.appendChild(color)
}
def domSource= new DOMSource(doc)
def domSource = new DOMSource(doc)
def result = new StreamResult(outputFile)
def tf = TransformerFactory.newInstance()
def transformer = tf.newTransformer()
Expand All @@ -204,7 +222,7 @@ android {
}
afterEvaluate {
android.applicationVariants.each { variant ->
variant.getProductFlavors().each{it.themes.createTask(variant.name)}
variant.getProductFlavors().each { it.themes.createTask(variant.name) }
}
}
}
Expand All @@ -215,7 +233,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools:sdk-common:26.0.0'
classpath 'com.android.tools:sdk-common:26.1.2'
classpath 'org.apache.commons:commons-text:1.1'
}
}
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Apr 24 12:20:06 CEST 2017
#Fri Mar 03 11:54:15 CET 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
4 changes: 2 additions & 2 deletions publish.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ext {
sync_framework_maven_url = "file:/${rootProject.projectDir}/artifacts"
sync_framework_version = '0.10.2'
sync_framework_version_int = 10002
sync_framework_version = '0.11.0'
sync_framework_version_int = 11000
}

// gradle publish ... for my needs
Expand Down
8 changes: 4 additions & 4 deletions sync-framework/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ apply from: '../publish.gradle'
android {

compileSdkVersion 27
buildToolsVersion '27.0.0'
buildToolsVersion '27.0.3'
defaultConfig {
minSdkVersion 14
targetSdkVersion 27
Expand All @@ -25,9 +25,9 @@ android {
}
}
dependencies {
api 'com.fasterxml.jackson.core:jackson-core:2.9.4'
api 'com.android.support:support-annotations:27.0.2'
api 'android.arch.persistence:db:1.0.0'
api 'com.fasterxml.jackson.core:jackson-core:2.9.5'
api 'com.android.support:support-annotations:27.1.1'
api 'android.arch.persistence:db:1.1.0'
api project(path: ':auto-content-provider')
}

0 comments on commit 2d5c058

Please sign in to comment.