From 0bd9e9432959450b078f3a51d960fa400aad3f5a Mon Sep 17 00:00:00 2001 From: AliReza Beigy Date: Sat, 12 Sep 2020 14:03:07 +0430 Subject: [PATCH] Fix gradle release task when sonatypeUsername are not exist in rootProject Fix testInvalidReference test in windows platform Update .gitignore --- .gitignore | 8 ++++++++ .../java/org/jf/baksmali/InstructionMethodItemTest.java | 3 ++- build.gradle | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index b7db779a4..3de67b773 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,19 @@ /.gradle +/baksmali/bin /baksmali/build +/dexlib/bin /dexlib/build +/dexlib2/bin /dexlib2/build +/dexlib2/accessorTestGenerator/bin /dexlib2/accessorTestGenerator/build +/smali/bin /smali/build +/util/bin /util/build +/smalidea/bin /smalidea/build +/release *.iml *.ipr *.iws diff --git a/baksmali/src/test/java/org/jf/baksmali/InstructionMethodItemTest.java b/baksmali/src/test/java/org/jf/baksmali/InstructionMethodItemTest.java index 20a380379..269029db6 100644 --- a/baksmali/src/test/java/org/jf/baksmali/InstructionMethodItemTest.java +++ b/baksmali/src/test/java/org/jf/baksmali/InstructionMethodItemTest.java @@ -144,7 +144,8 @@ public Iterable getDebugItems() { IndentingWriter indentingWriter = new IndentingWriter(stringWriter); methodItem.writeTo(indentingWriter); - Assert.assertEquals("#Invalid reference\n#const-string v0, blahblahblah\nnop", stringWriter.toString()); + String line = System.getProperty("line.separator"); + Assert.assertEquals("#Invalid reference" + line + "#const-string v0, blahblahblah" + line + "nop", stringWriter.toString()); } private static class TestMethod extends BaseMethodReference implements Method { diff --git a/build.gradle b/build.gradle index 850c4e10c..d7a6c3a1f 100644 --- a/build.gradle +++ b/build.gradle @@ -142,6 +142,8 @@ subprojects { repository(url: 'https://oss.sonatype.org/service/local/staging/deploy/maven2/') { authentication(userName: sonatypeUsername, password: sonatypePassword) } + } else { + repository(url: "file://release") } pom.artifactId = project.name