Skip to content

Commit

Permalink
Update project structure and dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
devgianlu committed Sep 14, 2024
1 parent 2068d11 commit 06f713b
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 31 deletions.
2 changes: 1 addition & 1 deletion CommonUtils
Submodule CommonUtils updated 1 files
+8 −6 build.gradle
14 changes: 8 additions & 6 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ import com.github.triplet.gradle.androidpublisher.ReleaseStatus

plugins {
id 'com.github.triplet.play' version '3.9.1'
id 'com.android.application'
id 'com.google.gms.google-services'
id 'com.google.firebase.crashlytics'
}

apply plugin: 'com.android.application'

def isCi = System.getenv("CI") == "true"
android {
namespace 'com.gianlu.aria2app'
Expand Down Expand Up @@ -87,6 +88,10 @@ android {
useLegacyPackaging = true
}
}

buildFeatures {
buildConfig true
}
}

play {
Expand Down Expand Up @@ -118,8 +123,5 @@ dependencies {
implementation 'androidx.documentfile:documentfile:1.0.1'
implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'

implementation 'com.google.android.material:material:1.11.0'
implementation 'com.google.android.material:material:1.12.0'
}

apply plugin: 'com.google.gms.google-services'
apply plugin: 'com.google.firebase.crashlytics'
27 changes: 4 additions & 23 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,24 +1,5 @@
buildscript {
repositories {
google()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:8.6.0'
classpath 'com.google.gms:google-services:4.4.1'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
}
}

allprojects {
repositories {
google()
mavenCentral()
maven { url "https://jitpack.io" }
}
}

task clean(type: Delete) {
delete rootProject.buildDir
plugins {
id 'com.android.application' version '8.6.0' apply false
id 'com.google.gms.google-services' version '4.4.2' apply false
id 'com.google.firebase.crashlytics' version '3.0.2' apply false
}
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
android.useAndroidX=true
android.enableJetifier=true
org.gradle.jvmargs=-Xmx1024m
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false
23 changes: 23 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
pluginManagement {
repositories {
google {
content {
includeGroupByRegex("com\\.android.*")
includeGroupByRegex("com\\.google.*")
includeGroupByRegex("androidx.*")
}
}
mavenCentral()
gradlePluginPortal()
}
}

dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
google()
mavenCentral()
maven { url "https://jitpack.io" }
}
}

include ':CommonUtils', ':aria2lib', ':app'
project(':CommonUtils').projectDir = new File('./CommonUtils')
project(':aria2lib').projectDir = new File('./aria2lib')

0 comments on commit 06f713b

Please sign in to comment.