From e372f23ae7723a7075f3730a89cc2eed6c11c932 Mon Sep 17 00:00:00 2001 From: deniscerri <64997243+deniscerri@users.noreply.github.com> Date: Sat, 15 Apr 2023 14:32:37 +0200 Subject: [PATCH] gradle fixes --- app/build.gradle | 27 ++++++++++++++++----------- settings.gradle | 26 ++++++++++++++++---------- 2 files changed, 32 insertions(+), 21 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index efc31e67..9736c389 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,23 +8,28 @@ plugins { } def properties = new Properties() -try { - def propertiesFile = rootProject.file("local.properties") - properties.load(new FileInputStream(propertiesFile)) -}catch(IOException ignored){} +def propertiesFile = rootProject.file("local.properties") + android { namespace 'com.deniscerri.ytdlnis' compileSdk 33 - signingConfigs { - debug { - storeFile file(properties["signingConfig.storeFile"]) - storePassword properties["signingConfig.storePassword"] - keyAlias properties["signingConfig.keyAlias"] - keyPassword properties["signingConfig.keyPassword"] - } + if(propertiesFile.exists()){ + try { + properties.load(new FileInputStream(propertiesFile)) + signingConfigs { + debug { + storeFile file(properties["signingConfig.storeFile"]) + storePassword properties["signingConfig.storePassword"] + keyAlias properties["signingConfig.keyAlias"] + keyPassword properties["signingConfig.keyPassword"] + } + } + }catch(IOException ignored){} + } + defaultConfig { applicationId "com.deniscerri.ytdl" minSdk 23 diff --git a/settings.gradle b/settings.gradle index e3232312..18401e09 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,18 +1,24 @@ -//pluginManagement { - // repositories { - //gradlePluginPortal() - // google() - // mavenCentral() - // } -//} - +pluginManagement { + repositories { + gradlePluginPortal() + google() + jcenter() + mavenCentral() + maven { url 'https://jitpack.io' } + maven { url "https://dl.bintray.com/kodein-framework/Kodein-DI" } + } +} dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { google() + jcenter() mavenCentral() + maven { url 'https://jitpack.io' } + maven { url "https://dl.bintray.com/kodein-framework/Kodein-DI" } } } - rootProject.name = "YTDLnis" -include ':app', ':benchmark' + +include ':common', ':app', ':library', ':ffmpeg' +include ':benchmark'