Updated dependencies + tweaking bugfix for alertdialog + fixed some b…

…uild errors
AlexanderEggers · Oct 21, 2018 · bea9942 · bea9942
1 parent 5e77041
commit bea9942
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 26 deletions.
diff --git a/build.gradle b/build.gradle
@@ -8,9 +8,9 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
+        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
     }
 }
 

diff --git a/examples/build.gradle b/examples/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion "27.0.3"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
         applicationId "org.hitogo.examples"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
     }
@@ -26,6 +26,6 @@ dependencies {
     //testImplementation 'org.hitogo:hitogo-testing:1.0.0-beta19.1'
 
     //Support lib dependencies
-    implementation 'com.android.support:appcompat-v7:27.0.2'
-    implementation 'com.android.support:design:27.0.2'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:design:28.0.0'
 }
diff --git a/examples/src/main/java/org/hitogo/examples/MainActivity.java b/examples/src/main/java/org/hitogo/examples/MainActivity.java
@@ -382,7 +382,7 @@ public void onClick(@NonNull Alert alert, Object parameter) {
                 .asDismissible(closeButton)
                 .addText("Test")
                 .setTitle("Test Title")
-                .asLayoutChild(R.id.fake_id)
+                .asLayoutChild(-1)
                 .addButton(button)
                 .dismissByLayoutClick(true)
                 .addVisibilityListener(new VisibilityListener<ViewAlert>() {

diff --git a/examples/src/main/res/values/id.xml b/examples/src/main/res/values/id.xml
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ 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
diff --git a/library/build.gradle b/library/build.gradle
@@ -13,7 +13,7 @@ ext {
     siteUrl = 'https://github.com/Mordag/hitogo'
     gitUrl = 'https://github.com/Mordag/hitogo.git'
 
-    libraryVersion = '1.0.1'
+    libraryVersion = '1.0.2'
 
     developerId = 'mordag'
     developerName = 'Alexander Eggers'
@@ -28,12 +28,12 @@ ext {
 }
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion "27.0.3"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
         minSdkVersion 16
-        versionName "1.0.0"
+        versionName "1.0.2"
         consumerProguardFiles 'proguard-rules.pro'
     }
 
@@ -53,8 +53,8 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     //Support lib dependencies
-    implementation 'com.android.support:appcompat-v7:27.0.2'
-    implementation 'com.android.support:design:27.0.2'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:design:28.0.0'
 }
 
 apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'

diff --git a/library/src/main/java/org/hitogo/alert/dialog/DialogAlertImpl.java b/library/src/main/java/org/hitogo/alert/dialog/DialogAlertImpl.java
@@ -30,7 +30,6 @@
 @SuppressWarnings({"unchecked"})
 public class DialogAlertImpl extends AlertImpl<DialogAlertParams> implements DialogAlert {
 
-    private static final int MAX_BUILDER_BUTTON_AMOUNT = 3;
     private static final int PRIMARY_BUTTON = 0;
     private static final int SECONDARY_BUTTON = 1;
     private static final int NEUTRAL_BUTTON = 2;

diff --git a/testing/build.gradle b/testing/build.gradle
@@ -13,7 +13,7 @@ ext {
     siteUrl = 'https://github.com/Mordag/hitogo'
     gitUrl = 'https://github.com/Mordag/hitogo.git'
 
-    libraryVersion = '1.0.1'
+    libraryVersion = '1.0.2'
 
     developerId = 'mordag'
     developerName = 'Alexander Eggers'
@@ -28,12 +28,12 @@ ext {
 }
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion "27.0.3"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
         minSdkVersion 16
-        versionName "1.0.0"
+        versionName "1.0.2"
         consumerProguardFiles 'proguard-rules.pro'
     }
 
@@ -54,7 +54,7 @@ dependencies {
     //implementation 'org.hitogo:hitogo-core:1.0.1'
     implementation project(path: ':hitogo-core')
 
-    implementation "com.android.support:support-annotations:27.0.2"
+    implementation "com.android.support:support-annotations:28.0.0"
     implementation "junit:junit:4.12"
     implementation "org.mockito:mockito-all:1.10.19"
 }