From 3847f89db4f2aa946dd92274def2b274923ea3e9 Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Sat, 17 Dec 2022 10:20:02 +0100 Subject: [PATCH] Artifactory --- app/build.gradle | 3 +- .../info/hannes/github/sample/MainActivity.kt | 11 ++++- app/src/main/res/layout/activity_main.xml | 17 +++++-- build.gradle | 1 + githubAppUpdate/build.gradle | 6 ++- .../info/hannes/github/AppUpdateHelper.kt | 49 +++++++++++++++++++ 6 files changed, 80 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 611cada..75fe27c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,7 +10,7 @@ android { versionCode getGitCommitCount() versionName "1.0" - minSdkVersion 21 + minSdkVersion 26 targetSdkVersion 33 buildConfigField "String", 'GIT_REPOSITORY', "\"" + getGitOriginRemote() + "\"" @@ -18,6 +18,7 @@ android { packagingOptions { pickFirst 'META-INF/atomicfu.kotlin_module' + pickFirst 'META-INF/DEPENDENCIES' } buildFeatures { diff --git a/app/src/main/java/info/hannes/github/sample/MainActivity.kt b/app/src/main/java/info/hannes/github/sample/MainActivity.kt index 2b8c883..b64254f 100644 --- a/app/src/main/java/info/hannes/github/sample/MainActivity.kt +++ b/app/src/main/java/info/hannes/github/sample/MainActivity.kt @@ -27,7 +27,7 @@ class MainActivity : AppCompatActivity() { BuildConfig.GIT_REPOSITORY ) - binding.button.setOnClickListener { + binding.buttonGithub.setOnClickListener { AppUpdateHelper.checkWithDialog( this, BuildConfig.GIT_REPOSITORY, @@ -35,6 +35,15 @@ class MainActivity : AppCompatActivity() { force = true // just to enable debugging, without you can only debug once a day ) } + + binding.buttonArtifactory.setOnClickListener { + AppUpdateHelper.checkArtifactoryDialog( + this, + "https://artifactory.myserver.info", + { msg -> Log.d("result", msg) }, + force = true // just to enable debugging, without you can only debug once a day + ) + } } } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 746ee3a..7c09803 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -6,19 +6,28 @@ android:layout_width="match_parent" android:layout_height="match_parent"> -