diff --git a/app/build.gradle b/app/build.gradle index a6464fc..2d3f46b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,7 +9,7 @@ android { versionCode getGitCommitCount() versionName "1.0" - minSdkVersion 21 + minSdkVersion 26 compileSdk 35 targetSdkVersion 35 @@ -20,7 +20,7 @@ android { } packagingOptions { resources { - pickFirsts += ["META-INF/atomicfu.kotlin_module"] + pickFirsts += ["META-INF/atomicfu.kotlin_module", "META-INF/DEPENDENCIES"] } } compileOptions { diff --git a/app/src/androidTest/java/info/hannes/github/sample/SmokeTest.kt b/app/src/androidTest/java/info/hannes/github/sample/SmokeTest.kt index 0bd02c0..bbf868d 100644 --- a/app/src/androidTest/java/info/hannes/github/sample/SmokeTest.kt +++ b/app/src/androidTest/java/info/hannes/github/sample/SmokeTest.kt @@ -59,4 +59,23 @@ class SmokeTest { .check(matches(isDisplayed())) .perform(click()) } + + @Test + fun updateArtifactory() { + onView(isRoot()) + .perform(captureToBitmap { bitmap: Bitmap -> bitmap.writeToTestStorage("${javaClass.simpleName}_${nameRule.methodName}-1") }) + onView(withId(R.id.buttonArtifactory)).perform(click()) + onView(isRoot()) + .perform(captureToBitmap { bitmap: Bitmap -> bitmap.writeToTestStorage("${javaClass.simpleName}_${nameRule.methodName}-2") }) + onView(withText(info.hannes.github.R.string.new_version)) + .inRoot(isDialog()) + .check(matches(isDisplayed())) + onView(isRoot()) + .perform(captureToBitmap { bitmap: Bitmap -> bitmap.writeToTestStorage("${javaClass.simpleName}_${nameRule.methodName}-3") }) + + onView(withText("SHOW")) + .inRoot(isDialog()) + .check(matches(isDisplayed())) + .perform(click()) + } } 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 2feeb7d..6d09e80 100644 --- a/app/src/main/java/info/hannes/github/sample/MainActivity.kt +++ b/app/src/main/java/info/hannes/github/sample/MainActivity.kt @@ -36,6 +36,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 3acc4be..7c09803 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -6,9 +6,10 @@ android:layout_width="match_parent" android:layout_height="match_parent"> -