Skip to content

Commit c2ac003

Browse files
jeprubioCopilot
jeprubio
and
Copilot
authored
Update packages from io.github.simonschiller.permissioncheck to com.telefonica.manifestcheck (#11)
* Add support for AGP 9.0.0 * Update github actions * Update version number * Update KDoc * Update buildSrc/src/main/kotlin/Dependencies.kt Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update junit-platform-launcher version (copilot suggestion) * Remove TaskConfiguratorFactory * Update packages from io.github.simonschiller.permissioncheck to com.telefonica.manifestcheck * Update packages from io.github.simonschiller.permissioncheck to com.telefonica.manifestcheck * Update packages from io.github.simonschiller.permissioncheck to com.telefonica.manifestcheck --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
1 parent d760b4e commit c2ac003

29 files changed

Lines changed: 226 additions & 144 deletions

File tree

‎manifestcheck/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ gradlePlugin {
4545
id = "com.telefonica.manifestcheck"
4646
displayName = "ManifestCheck"
4747
description = "ManifestCheck is a Gradle plugin that helps you catch Android permission/feature regressions automatically."
48-
implementationClass = "io.github.simonschiller.permissioncheck.PermissionCheckPlugin"
48+
implementationClass = "com.telefonica.manifestcheck.PermissionCheckPlugin"
4949
}
5050
}
5151
website = "https://github.com/Telefonica/android-permissioncheck"

manifestcheck/src/main/kotlin/io/github/simonschiller/permissioncheck/PermissionCheckPlugin.kt renamed to manifestcheck/src/main/kotlin/com/telefonica/manifestcheck/PermissionCheckPlugin.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package io.github.simonschiller.permissioncheck
1+
package com.telefonica.manifestcheck
22

33
import com.android.build.gradle.AppPlugin
4-
import io.github.simonschiller.permissioncheck.config.TaskConfiguratorV1
4+
import com.telefonica.manifestcheck.config.TaskConfiguratorV1
55
import org.gradle.api.Plugin
66
import org.gradle.api.Project
77

@@ -21,4 +21,4 @@ class PermissionCheckPlugin : Plugin<Project> {
2121
taskConfigurator.configureTasks(project, extension)
2222
}
2323
}
24-
}
24+
}

manifestcheck/src/test/kotlin/io/github/simonschiller/permissioncheck/MultiVariantPermissionCheckIntegrationTest.kt renamed to manifestcheck/src/test/kotlin/com/telefonica/manifestcheck/MultiVariantPermissionCheckIntegrationTest.kt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package io.github.simonschiller.permissioncheck
1+
package com.telefonica.manifestcheck
22

3-
import io.github.simonschiller.permissioncheck.testutil.AndroidProjectExtension
4-
import io.github.simonschiller.permissioncheck.testutil.TestVersions
5-
import io.github.simonschiller.permissioncheck.testutil.outcomeOf
3+
import com.telefonica.manifestcheck.testutil.AndroidProjectExtension
4+
import com.telefonica.manifestcheck.testutil.TestVersions
5+
import com.telefonica.manifestcheck.testutil.outcomeOf
66
import org.gradle.kotlin.dsl.support.normaliseLineSeparators
77
import org.gradle.testkit.runner.TaskOutcome
88
import org.junit.jupiter.api.Assertions.*
@@ -14,7 +14,8 @@ class MultiVariantPermissionCheckIntegrationTest {
1414

1515
@JvmField
1616
@RegisterExtension
17-
val androidProject = AndroidProjectExtension()
17+
val androidProject =
18+
AndroidProjectExtension()
1819

1920
@ParameterizedTest
2021
@ArgumentsSource(TestVersions::class)

manifestcheck/src/test/kotlin/io/github/simonschiller/permissioncheck/SingleVariantPermissionCheckIntegrationTest.kt renamed to manifestcheck/src/test/kotlin/com/telefonica/manifestcheck/SingleVariantPermissionCheckIntegrationTest.kt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package io.github.simonschiller.permissioncheck
1+
package com.telefonica.manifestcheck
22

3-
import io.github.simonschiller.permissioncheck.testutil.AndroidProjectExtension
4-
import io.github.simonschiller.permissioncheck.testutil.TestVersions
5-
import io.github.simonschiller.permissioncheck.testutil.outcomeOf
3+
import com.telefonica.manifestcheck.testutil.AndroidProjectExtension
4+
import com.telefonica.manifestcheck.testutil.TestVersions
5+
import com.telefonica.manifestcheck.testutil.outcomeOf
66
import org.gradle.kotlin.dsl.support.normaliseLineSeparators
77
import org.gradle.testkit.runner.TaskOutcome
88
import org.junit.jupiter.api.Assertions.*
@@ -14,7 +14,8 @@ class SingleVariantPermissionCheckIntegrationTest {
1414

1515
@JvmField
1616
@RegisterExtension
17-
val androidProject = AndroidProjectExtension()
17+
val androidProject =
18+
AndroidProjectExtension()
1819

1920
@ParameterizedTest
2021
@ArgumentsSource(TestVersions::class)

manifestcheck/src/test/kotlin/io/github/simonschiller/permissioncheck/testutil/AndroidProjectExtension.kt renamed to manifestcheck/src/test/kotlin/com/telefonica/manifestcheck/testutil/AndroidProjectExtension.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.github.simonschiller.permissioncheck.testutil
1+
package com.telefonica.manifestcheck.testutil
22

33
import org.gradle.kotlin.dsl.support.normaliseLineSeparators
44
import org.gradle.testkit.runner.BuildResult

manifestcheck/src/test/kotlin/io/github/simonschiller/permissioncheck/testutil/AndroidProjectExtensionTest.kt renamed to manifestcheck/src/test/kotlin/com/telefonica/manifestcheck/testutil/AndroidProjectExtensionTest.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.github.simonschiller.permissioncheck.testutil
1+
package com.telefonica.manifestcheck.testutil
22

33
import org.junit.jupiter.api.Test
44
import org.junit.jupiter.api.extension.RegisterExtension
@@ -7,15 +7,16 @@ class AndroidProjectExtensionTest {
77

88
@JvmField
99
@RegisterExtension
10-
val androidProject = AndroidProjectExtension()
10+
val androidProject =
11+
AndroidProjectExtension()
1112

1213
@Test
1314
fun `AndroidProjectExtension creates project that works correctly`() {
1415
androidProject.runTask(
1516
"tasks",
1617
"--all",
17-
gradleVersion = TestVersions.LATEST_GRADLE_VERSION,
18-
agpVersion = TestVersions.LATEST_AGP_VERSION
18+
gradleVersion = TestVersions.Companion.LATEST_GRADLE_VERSION,
19+
agpVersion = TestVersions.Companion.LATEST_AGP_VERSION
1920
)
2021
}
2122
}

manifestcheck/src/test/kotlin/io/github/simonschiller/permissioncheck/testutil/TestVersions.kt renamed to manifestcheck/src/test/kotlin/com/telefonica/manifestcheck/testutil/TestVersions.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.github.simonschiller.permissioncheck.testutil
1+
package com.telefonica.manifestcheck.testutil
22

33
import org.junit.jupiter.api.extension.ExtensionContext
44
import org.junit.jupiter.params.provider.Arguments
@@ -7,6 +7,7 @@ import java.util.stream.Stream
77

88
class TestVersions : ArgumentsProvider {
99

10+
@Suppress("DEPRECATION")
1011
override fun provideArguments(context: ExtensionContext): Stream<out Arguments> {
1112
val arguments = AGP_VERSIONS.flatMap { agpVersion ->
1213
GRADLE_VERSIONS

plugin-configurator-v1/src/main/kotlin/io/github/simonschiller/permissioncheck/config/TaskConfiguratorV1.kt renamed to plugin-configurator-v1/src/main/kotlin/com/telefonica/manifestcheck/config/TaskConfiguratorV1.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package io.github.simonschiller.permissioncheck.config
1+
package com.telefonica.manifestcheck.config
22

33
import com.android.build.api.artifact.SingleArtifact
44
import com.android.build.api.variant.AndroidComponentsExtension
5-
import io.github.simonschiller.permissioncheck.PermissionCheckExtension
5+
import com.telefonica.manifestcheck.PermissionCheckExtension
66
import org.gradle.api.Project
77

88
/** Configures the tasks for AGP versions 7.0.0-alpha01 and above. */
@@ -24,4 +24,4 @@ class TaskConfiguratorV1 : TaskConfigurator() {
2424
}
2525
}
2626
}
27-
}
27+
}

plugin-core/src/main/kotlin/io/github/simonschiller/permissioncheck/PermissionCheckExtension.kt renamed to plugin-core/src/main/kotlin/com/telefonica/manifestcheck/PermissionCheckExtension.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.github.simonschiller.permissioncheck
1+
package com.telefonica.manifestcheck
22

33
import org.gradle.api.file.*
44
import org.gradle.api.model.ObjectFactory

plugin-core/src/main/kotlin/io/github/simonschiller/permissioncheck/PermissionCheckTask.kt renamed to plugin-core/src/main/kotlin/com/telefonica/manifestcheck/PermissionCheckTask.kt

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package io.github.simonschiller.permissioncheck
2-
3-
import io.github.simonschiller.permissioncheck.internal.BaselineHandler
4-
import io.github.simonschiller.permissioncheck.internal.ManifestParser
5-
import io.github.simonschiller.permissioncheck.internal.PermissionChecker
6-
import io.github.simonschiller.permissioncheck.internal.report.HtmlReporter
7-
import io.github.simonschiller.permissioncheck.internal.report.LogReporter
8-
import io.github.simonschiller.permissioncheck.internal.report.XmlReporter
1+
package com.telefonica.manifestcheck
2+
3+
import com.telefonica.manifestcheck.internal.BaselineHandler
4+
import com.telefonica.manifestcheck.internal.ManifestParser
5+
import com.telefonica.manifestcheck.internal.PermissionChecker
6+
import com.telefonica.manifestcheck.internal.report.HtmlReporter
7+
import com.telefonica.manifestcheck.internal.report.LogReporter
8+
import com.telefonica.manifestcheck.internal.report.XmlReporter
99
import org.gradle.api.DefaultTask
1010
import org.gradle.api.GradleException
1111
import org.gradle.api.file.RegularFile
@@ -66,7 +66,8 @@ open class PermissionCheckTask : DefaultTask() {
6666
val permissions = variants.get().zip(manifestPermissions).toMap()
6767

6868
val baselineFile = baseline.get().asFile
69-
val baselineHandler = BaselineHandler(baselineFile)
69+
val baselineHandler =
70+
BaselineHandler(baselineFile)
7071

7172
// Create (or recreate) the baseline if needed
7273
if (recreate.get() || !baselineFile.exists()) {
@@ -87,7 +88,8 @@ open class PermissionCheckTask : DefaultTask() {
8788
}
8889

8990
// Make sure the current permissions match the ones from the baseline
90-
val permissionChecker = PermissionChecker()
91+
val permissionChecker =
92+
PermissionChecker()
9193
val violations = permissions.mapValues { (variantName, variantPermissions) ->
9294
permissionChecker.findViolations(baselinePermissions.getValue(variantName), variantPermissions, strict.get())
9395
}

0 commit comments

Comments
 (0)