Skip to content

Commit

Permalink
Update Gradle scripts and manifest
Browse files Browse the repository at this point in the history
  • Loading branch information
petrnohejl committed Jun 14, 2017
1 parent 1f548ab commit 2fc6fa7
Show file tree
Hide file tree
Showing 20 changed files with 98 additions and 22 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Changelog
=========

This document list the most important changes in Alfonz library. For more detailed changelog see Git log.
This document lists the most important changes in Alfonz library. For more detailed changelog see Git log.


0.5.0
Expand Down
2 changes: 1 addition & 1 deletion alfonz-adapter/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ dependencies
android
{
compileSdkVersion 25
buildToolsVersion "25.0.2"
buildToolsVersion "25.0.3"

defaultConfig
{
Expand Down
8 changes: 8 additions & 0 deletions alfonz-adapter/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,11 @@
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
2 changes: 1 addition & 1 deletion alfonz-graphics/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ dependencies
android
{
compileSdkVersion 25
buildToolsVersion "25.0.2"
buildToolsVersion "25.0.3"

defaultConfig
{
Expand Down
8 changes: 8 additions & 0 deletions alfonz-graphics/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,11 @@
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
2 changes: 1 addition & 1 deletion alfonz-media/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ dependencies
android
{
compileSdkVersion 25
buildToolsVersion "25.0.2"
buildToolsVersion "25.0.3"

defaultConfig
{
Expand Down
8 changes: 8 additions & 0 deletions alfonz-media/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,11 @@
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
2 changes: 1 addition & 1 deletion alfonz-mvvm/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ dependencies
android
{
compileSdkVersion 25
buildToolsVersion "25.0.2"
buildToolsVersion "25.0.3"

defaultConfig
{
Expand Down
8 changes: 8 additions & 0 deletions alfonz-mvvm/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,11 @@
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
8 changes: 4 additions & 4 deletions alfonz-rest/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,17 @@ ext
dependencies
{
compile "com.android.support:support-annotations:25.3.1"
compile "com.squareup.okhttp3:okhttp:3.7.0"
compile "com.squareup.retrofit2:retrofit:2.2.0"
compile "io.reactivex.rxjava2:rxjava:2.0.8"
compile "com.squareup.okhttp3:okhttp:3.8.0"
compile "com.squareup.retrofit2:retrofit:2.3.0"
compile "io.reactivex.rxjava2:rxjava:2.1.0"
compile fileTree(dir: "libs", include: ["*.jar"])
compile project(":alfonz-rx")
}

android
{
compileSdkVersion 25
buildToolsVersion "25.0.2"
buildToolsVersion "25.0.3"

defaultConfig
{
Expand Down
8 changes: 8 additions & 0 deletions alfonz-rest/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,11 @@
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
4 changes: 2 additions & 2 deletions alfonz-rx/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ dependencies
{
compile "com.android.support:support-annotations:25.3.1"
compile "io.reactivex.rxjava2:rxandroid:2.0.1"
compile "io.reactivex.rxjava2:rxjava:2.0.8"
compile "io.reactivex.rxjava2:rxjava:2.1.0"
compile fileTree(dir: "libs", include: ["*.jar"])
}

android
{
compileSdkVersion 25
buildToolsVersion "25.0.2"
buildToolsVersion "25.0.3"

defaultConfig
{
Expand Down
8 changes: 8 additions & 0 deletions alfonz-rx/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,11 @@
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
2 changes: 1 addition & 1 deletion alfonz-utility/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ dependencies
android
{
compileSdkVersion 25
buildToolsVersion "25.0.2"
buildToolsVersion "25.0.3"

defaultConfig
{
Expand Down
8 changes: 8 additions & 0 deletions alfonz-utility/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,11 @@
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
2 changes: 1 addition & 1 deletion alfonz-view/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ dependencies
android
{
compileSdkVersion 25
buildToolsVersion "25.0.2"
buildToolsVersion "25.0.3"

defaultConfig
{
Expand Down
8 changes: 8 additions & 0 deletions alfonz-view/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,11 @@
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
7 changes: 5 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,13 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.1'
classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
classpath 'me.tatarka:gradle-retrolambda:3.6.0'
classpath 'me.tatarka:gradle-retrolambda:3.6.1'

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

Expand Down
15 changes: 8 additions & 7 deletions samples/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ dependencies
compile "com.android.support:recyclerview-v7:25.3.1"
compile "com.android.support:support-annotations:25.3.1"
compile "com.android.support:design:25.3.1"
compile "com.google.code.gson:gson:2.8.0"
compile "com.squareup.okhttp3:okhttp:3.7.0"
compile "com.squareup.okhttp3:logging-interceptor:3.7.0"
compile "com.squareup.retrofit2:retrofit:2.2.0"
compile "com.squareup.retrofit2:adapter-rxjava2:2.2.0"
compile "com.squareup.retrofit2:converter-gson:2.2.0"
compile "com.google.code.gson:gson:2.8.1"
compile "com.squareup.okhttp3:okhttp:3.8.0"
compile "com.squareup.okhttp3:logging-interceptor:3.8.0"
compile "com.squareup.retrofit2:retrofit:2.3.0"
compile "com.squareup.retrofit2:adapter-rxjava2:2.3.0"
compile "com.squareup.retrofit2:converter-gson:2.3.0"
compile fileTree(dir: "libs", include: ["*.jar"])
compile project(":alfonz-adapter")
compile project(":alfonz-graphics")
Expand All @@ -31,7 +31,7 @@ dependencies
android
{
compileSdkVersion 25
buildToolsVersion "25.0.2"
buildToolsVersion "25.0.3"

defaultConfig
{
Expand All @@ -40,6 +40,7 @@ android
targetSdkVersion 25
versionCode 1
versionName "1.0.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}

buildTypes
Expand Down
8 changes: 8 additions & 0 deletions samples/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,11 @@
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile

0 comments on commit 2fc6fa7

Please sign in to comment.