Merge pull request #590 from F43nd1r/master

Release 4.10
ACRA · Jul 4, 2017 · 4312b0f · 4312b0f
2 parents 69958c9 + 058d29b
commit 4312b0f
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/acra/build.gradle b/acra/build.gradle
@@ -54,10 +54,10 @@ dependencies {
 
 release {
     failOnUnversionedFiles = false
-    failOnCommitNeeded = false
+    failOnCommitNeeded = true
     tagTemplate = '$name-$version'
     git {
-        requireBranch = ""
+        requireBranch = "master"
     }
 }
 
@@ -97,7 +97,7 @@ artifacts {
 }
 
 signing {
-    required { signing.keyId != "" }
+    required { signing.hasProperty('keyId') }
     sign configurations.archives
 }
 

diff --git a/acra/gradle.properties b/acra/gradle.properties
@@ -1,7 +1,7 @@
-version=4.9.3-SNAPSHOT
-group=ch.acra
+version=4.10.1-SNAPSHOT
+group=com.faendir
 archivesBaseName=acra
-androidVersion=23
+androidVersion=24
 supportVersion=24.1.1
 proguardFile=src/main/proguard/proguard.cfg
 release.useAutomaticVersion=true

diff --git a/acra/src/main/java/org/acra/ErrorReporter.java b/acra/src/main/java/org/acra/ErrorReporter.java
@@ -52,12 +52,12 @@
  * directory. This report file is then sent:
  * </p>
  * <ul>
- * <li>immediately if {@link ReportsCrashes#reportingInteractionMode()} is set to
+ * <li>immediately if {@link ReportsCrashes#mode()} is set to
  * {@link ReportingInteractionMode#SILENT} or
  * {@link ReportingInteractionMode#TOAST},</li>
  * <li>on application start if in the previous case the transmission could not
  * technically be made,</li>
- * <li>when the user accepts to send it if {@link ReportsCrashes#reportingInteractionMode()} is set
+ * <li>when the user accepts to send it if {@link ReportsCrashes#mode()} is set
  * to {@link ReportingInteractionMode#NOTIFICATION}.</li>
  * </ul>
  * <p>

diff --git a/annotationprocessor/src/main/java/org/acra/ModelUtils.java b/annotationprocessor/src/main/java/org/acra/ModelUtils.java
@@ -199,7 +199,7 @@ void addClassJavadoc(TypeSpec.Builder builder, TypeElement base) {
     MethodSpec.Builder addMethodJavadoc(MethodSpec.Builder builder, ExecutableElement base) {
         final String baseComment = elementUtils.getDocComment(base);
         if (baseComment == null) return builder;
-        final String name = base.getSimpleName().toString();
+        final String name = getName(base);
         return builder.addJavadoc(baseComment.replaceAll("(\n|^) ", "$1").replaceAll("@return ((.|\n)*)$", "@param " + name + " $1@return this instance\n"));
     }
 

diff --git a/build.gradle b/build.gradle
@@ -5,10 +5,10 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:2.3.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
         classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.4.0"
-        classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.5.3"
+        classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.9.0"
         classpath 'net.researchgate:gradle-release:2.5.0'
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include ':acra', ':acratest', ':annotationprocessor', ':annotations'
+include ':acra', ':annotationprocessor', ':annotations'