Skip to content
This repository was archived by the owner on Sep 3, 2023. It is now read-only.

Commit 1d4b196

Browse files
committed
Various cleanup, deprecated code upgrades; remove unit tests as they need a revamp. Bump to 3.0.1.
1 parent 52c591f commit 1d4b196

File tree

5 files changed

+19
-24
lines changed

5 files changed

+19
-24
lines changed

CHANGELOG.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
3.0.1
1+
3.0.2
22

3-
It's been a while! Going right to 3.0.1:
3+
It's been a while! Going right to 3.0.2:
44

55
* Updated dependencies.
66
* Add new SDK 33 permissions to Permission.kt (#25 from @stephanepechard).
7-
* Update internal lifecycle utilities to use `DefaultLifecycleObserver` instead of deprecated reflection-based annotations.
7+
* Update usages of deprecated APIs internally.
88

99
---
1010

core/src/main/java/com/afollestad/assent/internal/PermissionFragment.kt

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package com.afollestad.assent.internal
1717

1818
import android.content.Context
19+
import android.os.Bundle
1920
import androidx.activity.result.ActivityResultLauncher
2021
import androidx.activity.result.contract.ActivityResultContracts.RequestMultiplePermissions
2122
import androidx.fragment.app.Fragment
@@ -28,7 +29,14 @@ import com.afollestad.assent.internal.Assent.Companion.get
2829
/** @author Aidan Follestad (afollestad) */
2930
class PermissionFragment : Fragment() {
3031

31-
var launcher: ActivityResultLauncher<*>? = null
32+
var launcher: ActivityResultLauncher<Array<String>>? = null
33+
34+
override fun onCreate(savedInstanceState: Bundle?) {
35+
launcher = registerForActivityResult(RequestMultiplePermissions()) {
36+
onPermissionsResponse(it)
37+
}
38+
super.onCreate(savedInstanceState)
39+
}
3240

3341
override fun onAttach(context: Context) {
3442
super.onAttach(context)
@@ -38,16 +46,14 @@ class PermissionFragment : Fragment() {
3846
override fun onDetach() {
3947
log("onDetach()")
4048
launcher?.unregister()
49+
launcher = null
4150
super.onDetach()
4251
}
4352

4453
internal fun perform(request: PendingRequest) {
4554
log("perform(%s)", request)
46-
launcher = registerForActivityResult(RequestMultiplePermissions()) {
47-
onPermissionsResponse(it)
48-
}.apply {
49-
launch(request.permissions.allValues())
50-
}
55+
launcher?.launch(request.permissions.allValues())
56+
?: error("PermissionFragment attempted request before lifecycle creation.")
5157
}
5258

5359
internal fun detach() {

dependencies.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ext.versions = [
22
min_sdk: 14,
33
compile_sdk: 33,
4-
publish_version: "3.0.1",
5-
publish_version_code: 25
4+
publish_version: "3.0.2",
5+
publish_version_code: 26
66
]
77

88
ext.deps = [

gradle/android-common.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ apply from: rootProject.file("gradle/spotless-plugin.gradle")
88
if (!project.hasProperty("min_sdk")) {
99
ext.min_sdk = versions.min_sdk
1010
} else {
11-
logger.warn("Using minSdk: $min_sdk")
11+
logger.info("Using minSdk: $min_sdk")
1212
}
1313

1414
android {

gradle/publish-module.gradle

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -77,17 +77,6 @@ afterEvaluate {
7777
developerConnection = 'scm:git:ssh://github.com/afollestad/assent.git'
7878
url = 'https://github.com/afollestad/assent/tree/main'
7979
}
80-
// A slightly hacky fix so that the POM will include any transitive dependencies
81-
// that the module builds upon.
82-
withXml {
83-
def dependenciesNode = asNode().appendNode('dependencies')
84-
project.configurations.implementation.allDependencies.each {
85-
def dependencyNode = dependenciesNode.appendNode('dependency')
86-
dependencyNode.appendNode('groupId', it.group)
87-
dependencyNode.appendNode('artifactId', it.name)
88-
dependencyNode.appendNode('version', it.version)
89-
}
90-
}
9180
}
9281
}
9382
}
@@ -104,5 +93,5 @@ signing {
10493
}
10594

10695
afterEvaluate {
107-
publishReleasePublicationToSonatypeRepository.dependsOn assembleRelease
96+
publishToSonatype.dependsOn assembleRelease
10897
}

0 commit comments

Comments
 (0)