Commit d258f13b authored by Daniel Wolf's avatar Daniel Wolf
Browse files

Merge branch 'master' of https://git.frostnerd.com/PublicAndroidApps/smokescreen into translations

parents 2a953a2d 5a5f5da1
Pipeline #6919 passed with stage
in 5 minutes and 17 seconds
...@@ -115,16 +115,16 @@ dependencies { ...@@ -115,16 +115,16 @@ dependencies {
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.5' implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.5'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.5' implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.5'
implementation 'com.frostnerd.utilskt:preferences:1.5.19' // https://git.frostnerd.com/AndroidUtils/preferenceskt implementation 'com.frostnerd.utilskt:preferences:1.5.21' // https://git.frostnerd.com/AndroidUtils/preferenceskt
implementation 'com.frostnerd.utilskt:navigationdraweractivity:1.3.31' // https://git.frostnerd.com/AndroidUtils/navigationdraweractivity implementation 'com.frostnerd.utilskt:navigationdraweractivity:1.3.35' // https://git.frostnerd.com/AndroidUtils/navigationdraweractivity
implementation 'com.frostnerd.utilskt:encrypteddnstunnelproxy:1.5.187' // https://git.frostnerd.com/AndroidUtils/encrypteddnstunnelproxy implementation 'com.frostnerd.utilskt:encrypteddnstunnelproxy:1.5.190' // https://git.frostnerd.com/AndroidUtils/encrypteddnstunnelproxy
implementation 'com.frostnerd.utilskt:general:1.0.21' // https://git.frostnerd.com/AndroidUtils/generalkt implementation 'com.frostnerd.utilskt:general:1.0.22' // https://git.frostnerd.com/AndroidUtils/generalkt
implementation 'com.frostnerd.utilskt:adapters:1.1.8' // https://git.frostnerd.com/AndroidUtils/Adapters implementation 'com.frostnerd.utilskt:adapters:1.1.13' // https://git.frostnerd.com/AndroidUtils/Adapters
implementation 'androidx.work:work-runtime:2.3.4' implementation 'androidx.work:work-runtime:2.3.4'
implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.appcompat:appcompat:1.1.0'
implementation "androidx.preference:preference:1.1.0" implementation "androidx.preference:preference:1.1.1"
implementation "com.google.android.material:material:1.2.0-alpha05" implementation "com.google.android.material:material:1.2.0-alpha06"
implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0-alpha01' implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0-alpha01'
implementation "androidx.room:room-runtime:$room_version" implementation "androidx.room:room-runtime:$room_version"
......
...@@ -8,36 +8,56 @@ static def getSystemVariableOrDefault(String variable, String defaultValue) { ...@@ -8,36 +8,56 @@ static def getSystemVariableOrDefault(String variable, String defaultValue) {
return value return value
} }
def getArtifactoryUser() { ext.public_artifactory_user = "publicaccess"
def getArtifactoryUser(Boolean useDefault = true){
def user = System.getenv("ARTIFACTORY_USER") def user = System.getenv("ARTIFACTORY_USER")
if (user == null) { if(user == null && useDefault){
user = artifactory_username println "Using public artifactory user"
user = public_artifactory_user
} }
if (user == null) {
throw new Exception("Artifactory user not set!")
}
return user return user
} }
def getArtifactoryPassword() { ext.public_artifactory_password = "AKCp5ekwNjBNhRDnT7YK3BRHxdep6v1FyUSptgrAMhQBfq2eDTauVemGLmgyKucJYeEPsNJGP"
def getArtifactoryPassword(Boolean useDefault = true){
def pw = System.getenv("ARTIFACTORY_PASSWORD") def pw = System.getenv("ARTIFACTORY_PASSWORD")
if (pw == null) { if(pw == null && useDefault){
pw = artifactory_password println "Using public artifactory Password"
pw = public_artifactory_password
} }
if (pw == null) {
throw new Exception("Artifactory password not set!") return pw
}
ext.public_nexus_user = "publicaccess"
def getNexusUser(){
def user = System.getenv("NEXUS_USER")
if(user == null){
println "Using public Nexus user"
user = public_nexus_user
} else {
println "Nexus user: $user"
} }
return user
}
ext.public_nexus_token = "HWGxGVPtvV4p3ZS9RSXf"
def getNexusPassword(){
def pw = System.getenv("NEXUS_PASSWORD")
if(pw == null){
println "Using public Nexus password"
pw = public_nexus_token
}
return pw return pw
} }
ext.artifactory_username = getArtifactoryUser() ext.artifactory_username = getArtifactoryUser()
ext.artifactory_password = getArtifactoryPassword() ext.artifactory_password = getArtifactoryPassword()
ext.nexus_user = getNexusUser()
ext.nexus_password = getNexusPassword()
buildscript { buildscript {
ext.kotlin_version = '1.3.71' ext.kotlin_version = '1.3.72'
repositories { repositories {
google() google()
jcenter() jcenter()
...@@ -46,7 +66,7 @@ buildscript { ...@@ -46,7 +66,7 @@ buildscript {
} }
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.6.2' classpath 'com.android.tools.build:gradle:3.6.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
...@@ -72,6 +92,13 @@ allprojects { ...@@ -72,6 +92,13 @@ allprojects {
password = "$artifactory_password" password = "$artifactory_password"
} }
} }
maven {
url 'https://nexus.frostnerd.com/repository/libs-release/'
credentials {
username = "$nexus_user"
password = "$nexus_password"
}
}
maven { url "https://oss.sonatype.org/content/repositories/snapshots" } maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
maven { url 'https://jitpack.io' } maven { url 'https://jitpack.io' }
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment