Skip to content

Commit

Permalink
Revert "change group to prevent conflicts dependencies"
Browse files Browse the repository at this point in the history
This reverts commit e9b0c35.
  • Loading branch information
Peerapathananont, Kajornsak (Agoda) committed Dec 10, 2019
1 parent 195e7f8 commit 1845e58
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

apply plugin: 'com.android.library'

group = 'com.github.kajornsakp.screenshot'
group = 'com.facebook.testing.screenshot'

android {
compileSdkVersion versions.compileSdk
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) Facebook, Inc. and its affiliates.

VERSION_NAME=1.0.0
GROUP=com.github.kajornsakp.screenshot
VERSION_NAME=0.11.0
GROUP=com.facebook.testing.screenshot

POM_DESCRIPTION=Screenshot Testing framework for Android.
POM_URL=https://github.com/facebook/screenshot-tests-for-android
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class ScreenshotsPluginTest {

def depSet = project.getConfigurations().getByName('androidTestImplementation').getAllDependencies()
for (dep in depSet) {
if (dep.name == "core" && dep.group == 'com.github.kajornsakp.screenshot') {
if (dep.name == "core" && dep.group == 'com.facebook.testing.screenshot') {
return
}
}
Expand All @@ -77,7 +77,7 @@ class ScreenshotsPluginTest {

def depSet = project.getConfigurations().getByName('androidTestImplementation').getAllDependencies()
for (dep in depSet) {
if (dep.name == "core" && dep.group == 'com.github.kajornsakp.screenshot') {
if (dep.name == "core" && dep.group == 'com.facebook.testing.screenshot') {
fail()
}
}
Expand Down
3 changes: 1 addition & 2 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ buildscript {
mavenLocal()
jcenter()
google()
maven { url = uri("https://jitpack.io") }
}

dependencies {
Expand All @@ -28,7 +27,7 @@ apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'
apply plugin: 'com.github.kajornsakp.screenshot'
apply plugin: 'com.facebook.testing.screenshot'

android {
compileSdkVersion versions.compileSdk
Expand Down

0 comments on commit 1845e58

Please sign in to comment.