Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: include smali from source #2941

Merged
merged 2 commits into from
Nov 24, 2022
Merged

build: include smali from source #2941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
055b5fe
build: include smali from source
iBotPeaches Nov 18, 2022
92352d7
refactor: adjust build.gradle for repositories
iBotPeaches Nov 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions brut.apktool/apktool-cli/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,12 @@ dependencies {
}

buildscript {
repositories {
mavenCentral()
}

dependencies {
repositories {
mavenCentral()
gradlePluginPortal()
}

classpath(depends.proguard_gradle) {
exclude group: 'com.android.tools.build'
}
Expand Down
25 changes: 12 additions & 13 deletions brut.apktool/apktool-lib/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,19 @@ processResources {
}

dependencies {
testImplementation depends.junit

api project(':brut.j.dir'),
project(':brut.j.util'),
project(':brut.j.common')
api project(':brut.j.dir')
api project(':brut.j.util')
api project(':brut.j.common')

implementation depends.baksmali,
depends.smali,
depends.snakeyaml,
depends.xmlpull,
depends.guava,
depends.commons_lang,
depends.commons_io,
depends.commons_text
implementation depends.baksmali
implementation depends.smali
implementation depends.snakeyaml
implementation depends.xmlpull
implementation depends.guava
implementation depends.commons_lang
implementation depends.commons_io
implementation depends.commons_text

testImplementation depends.junit
testImplementation depends.xmlunit
}
5 changes: 0 additions & 5 deletions brut.j.common/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,3 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

dependencies {
testImplementation depends.junit
}

7 changes: 3 additions & 4 deletions brut.j.dir/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
*/

dependencies {
implementation project(':brut.j.common'),
project(':brut.j.util'),
depends.commons_io
testImplementation depends.junit
implementation project(':brut.j.common')
implementation project(':brut.j.util')
implementation depends.commons_io
}
5 changes: 2 additions & 3 deletions brut.j.util/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/

dependencies {
implementation project(':brut.j.common'),
depends.commons_io
testImplementation depends.junit
implementation project(':brut.j.common')
implementation depends.commons_io
}
17 changes: 10 additions & 7 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import java.nio.charset.StandardCharsets
buildscript {
ext {
depends = [
baksmali : 'org.smali:baksmali:2.5.2',
baksmali : 'com.github.iBotPeaches.smali:baksmali:403e90375e',
commons_cli : 'commons-cli:commons-cli:1.5.0',
commons_io : 'commons-io:commons-io:2.11.0',
commons_lang : 'org.apache.commons:commons-lang3:3.12.0',
Expand All @@ -27,14 +27,13 @@ buildscript {
junit : 'junit:junit:4.13.2',
proguard_gradle: 'com.guardsquare:proguard-gradle:7.1.1',
snakeyaml : 'org.yaml:snakeyaml:1.32:android',
smali : 'org.smali:smali:2.5.2',
smali : 'com.github.iBotPeaches.smali:smali:403e90375e',
xmlpull : 'xpp3:xpp3:1.1.4c',
xmlunit : 'xmlunit:xmlunit:1.6',
]
}

repositories {
mavenCentral()
gradlePluginPortal()
}
dependencies {
Expand Down Expand Up @@ -80,6 +79,14 @@ allprojects {
"licenseMain",
"licenseTest"
]

repositories {
mavenCentral()

// Obtain baksmali/smali from source builds - https://github.com/iBotPeaches/smali
// Remove when official smali releases come out again.
maven { url 'https://jitpack.io' }
}
}

tasks.withType(JavaCompile).configureEach {
Expand Down Expand Up @@ -136,10 +143,6 @@ task snapshot {
subprojects {
apply plugin: 'java'

repositories {
mavenCentral()
}

test {
testLogging {
exceptionFormat = 'full'
Expand Down