Skip to content

Commit e874830

Browse files
zach-klippensteinzach-klippenstein
authored
Merge pull request #113 from square/zachklipp/release-package-rename
Rename package and Maven group to com.squareup.workflow1.
2 parents df4ff3a + 8e89998 commit e874830

File tree

243 files changed

+1905
-1905
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

243 files changed

+1905
-1905
lines changed

‎README.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# workflow
22

33
[![Kotlin CI](https://github.com/square/workflow-kotlin/workflows/Kotlin%20CI/badge.svg)](https://github.com/square/workflow-kotlin/actions?query=branch%3Amain)
4-
[![Maven Central](https://img.shields.io/maven-central/v/com.squareup.workflow/workflow-core-jvm.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.squareup.workflow%22)
4+
[![Maven Central](https://img.shields.io/maven-central/v/com.squareup.workflow1/workflow-core-jvm.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.squareup.workflow%22)
55
[![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](https://www.apache.org/licenses/LICENSE-2.0)
66
[![Kotlinlang slack](https://img.shields.io/static/v1?label=kotlinlang&message=squarelibraries&color=brightgreen&logo=slack)](https://kotlinlang.slack.com/archives/C5HT9AL7Q)
77

@@ -34,28 +34,28 @@ your `repositories` block, and then add dependencies on the following artifacts:
3434
<th>Depend on this if…</th>
3535
</tr>
3636
<tr>
37-
<td nowrap><code>com.squareup.workflow:workflow-core-jvm:x.y.z</code></td>
37+
<td nowrap><code>com.squareup.workflow1:workflow-core-jvm:x.y.z</code></td>
3838
<td>You are writing a library module/project that uses Workflows, but you don't need to interact
3939
with the runtime from the outside.</td>
4040
</tr>
4141
<tr>
42-
<td nowrap><code>com.squareup.workflow:workflow-rx2:x.y.z</code></td>
42+
<td nowrap><code>com.squareup.workflow1:workflow-rx2:x.y.z</code></td>
4343
<td>You need to interact with RxJava2 from your Workflows.</td>
4444
</tr>
4545
<tr>
46-
<td nowrap><code>com.squareup.workflow:workflow-testing-jvm:x.y.z</code></td>
46+
<td nowrap><code>com.squareup.workflow1:workflow-testing-jvm:x.y.z</code></td>
4747
<td>You are writing tests. This should only be included as a test dependency.</td>
4848
</tr>
4949
<tr>
50-
<td nowrap><code>com.squareup.workflow:workflow-ui-core-android:x.y.z</code></td>
50+
<td nowrap><code>com.squareup.workflow1:workflow-ui-core-android:x.y.z</code></td>
5151
<td>You're writing an Android app that uses Workflows.</td>
5252
</tr>
5353
<tr>
54-
<td nowrap><code>com.squareup.workflow:workflow-ui-modal-android:x.y.z</code></td>
54+
<td nowrap><code>com.squareup.workflow1:workflow-ui-modal-android:x.y.z</code></td>
5555
<td>Your Android app uses modals (popups).</td>
5656
</tr>
5757
<tr>
58-
<td nowrap><code>com.squareup.workflow:workflow-ui-backstack-android:x.y.z</code></td>
58+
<td nowrap><code>com.squareup.workflow1:workflow-ui-backstack-android:x.y.z</code></td>
5959
<td>Your android app uses backstacks.</td>
6060
</tr>
6161
</table>
@@ -71,11 +71,11 @@ higher-level integrations with UI frameworks.
7171
<th>Depend on this if…</th>
7272
</tr>
7373
<tr>
74-
<td nowrap><code>com.squareup.workflow:workflow-runtime-jvm:x.y.z</code></td>
74+
<td nowrap><code>com.squareup.workflow1:workflow-runtime-jvm:x.y.z</code></td>
7575
<td>You need to interact directly with the runtime, i.e. streams of renderings and outputs.</td>
7676
</tr>
7777
<tr>
78-
<td nowrap><code>com.squareup.workflow:workflow-ui-core-jvm:x.y.z</code></td>
78+
<td nowrap><code>com.squareup.workflow1:workflow-ui-core-jvm:x.y.z</code></td>
7979
<td>You are writing workflow-ui-android for another UI framework. Defines the core types used by
8080
that artifact.</td>
8181
</tr>

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ android.enableJetifier=true
2424
# Required to publish to Nexus (see https://github.com/gradle/gradle/issues/11308)
2525
systemProp.org.gradle.internal.publish.checksums.insecure=true
2626

27-
GROUP=com.squareup.workflow
27+
GROUP=com.squareup.workflow1
2828
VERSION_NAME=1.0.0-alpha.2-SNAPSHOT
2929

3030
POM_DESCRIPTION=Reactive workflows

‎internal-testing-utils/api/internal-testing-utils.api‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
public final class com/squareup/workflow/internal/util/UncaughtExceptionGuard {
1+
public final class com/squareup/workflow1/internal/util/UncaughtExceptionGuard {
22
public fun <init> ()V
33
public final fun reportUncaught (Ljava/lang/Throwable;)V
44
public final fun runRethrowingUncaught (Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
55
}
66

7-
public final class com/squareup/workflow/internal/util/UncaughtExceptionGuardKt {
7+
public final class com/squareup/workflow1/internal/util/UncaughtExceptionGuardKt {
88
public static final fun rethrowingUncaughtExceptions (Lkotlin/jvm/functions/Function0;)V
99
}
1010

‎internal-testing-utils/src/main/java/com/squareup/workflow/internal/util/UncaughtExceptionGuard.kt‎ renamed to ‎internal-testing-utils/src/main/java/com/squareup/workflow1/internal/util/UncaughtExceptionGuard.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.squareup.workflow.internal.util
16+
package com.squareup.workflow1.internal.util
1717

1818
import java.util.concurrent.atomic.AtomicReference
1919

‎internal-testing-utils/src/test/java/com/squareup/workflow/internal/util/UncaughtExceptionGuardTest.kt‎ renamed to ‎internal-testing-utils/src/test/java/com/squareup/workflow1/internal/util/UncaughtExceptionGuardTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.squareup.workflow.internal.util
16+
package com.squareup.workflow1.internal.util
1717

1818
import com.google.common.truth.Truth.assertThat
1919
import junit.framework.TestCase.fail

‎samples/containers/android/src/main/java/com/squareup/sample/container/BackButtonScreen.kt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
*/
1616
package com.squareup.sample.container
1717

18-
import com.squareup.workflow.ui.BuilderBinding
19-
import com.squareup.workflow.ui.WorkflowUiExperimentalApi
20-
import com.squareup.workflow.ui.ViewFactory
21-
import com.squareup.workflow.ui.ViewRegistry
22-
import com.squareup.workflow.ui.backPressedHandler
23-
import com.squareup.workflow.ui.bindShowRendering
24-
import com.squareup.workflow.ui.buildView
25-
import com.squareup.workflow.ui.getShowRendering
18+
import com.squareup.workflow1.ui.BuilderBinding
19+
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
20+
import com.squareup.workflow1.ui.ViewFactory
21+
import com.squareup.workflow1.ui.ViewRegistry
22+
import com.squareup.workflow1.ui.backPressedHandler
23+
import com.squareup.workflow1.ui.bindShowRendering
24+
import com.squareup.workflow1.ui.buildView
25+
import com.squareup.workflow1.ui.getShowRendering
2626

2727
/**
2828
* Adds optional back button handling to a [wrapped] rendering, possibly overriding that

‎samples/containers/android/src/main/java/com/squareup/sample/container/SampleContainers.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ package com.squareup.sample.container
1818
import com.squareup.sample.container.overviewdetail.OverviewDetailContainer
1919
import com.squareup.sample.container.panel.PanelContainer
2020
import com.squareup.sample.container.panel.ScrimContainer
21-
import com.squareup.workflow.ui.WorkflowUiExperimentalApi
22-
import com.squareup.workflow.ui.ViewRegistry
21+
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
22+
import com.squareup.workflow1.ui.ViewRegistry
2323

2424
@OptIn(WorkflowUiExperimentalApi::class)
2525
val SampleContainers = ViewRegistry(

‎samples/containers/android/src/main/java/com/squareup/sample/container/overviewdetail/OverviewDetailConfig.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
*/
1616
package com.squareup.sample.container.overviewdetail
1717

18-
import com.squareup.workflow.ui.WorkflowUiExperimentalApi
19-
import com.squareup.workflow.ui.ViewEnvironmentKey
18+
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
19+
import com.squareup.workflow1.ui.ViewEnvironmentKey
2020

2121
/**
22-
* [com.squareup.workflow.ui.ViewEnvironment] value that informs views
22+
* [com.squareup.workflow1.ui.ViewEnvironment] value that informs views
2323
* whether they're children of a [OverviewDetailContainer], and if so
2424
* in what configuration.
2525
*/

‎samples/containers/android/src/main/java/com/squareup/sample/container/overviewdetail/OverviewDetailContainer.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ import com.squareup.sample.container.R
2222
import com.squareup.sample.container.overviewdetail.OverviewDetailConfig.Detail
2323
import com.squareup.sample.container.overviewdetail.OverviewDetailConfig.Overview
2424
import com.squareup.sample.container.overviewdetail.OverviewDetailConfig.Single
25-
import com.squareup.workflow.ui.WorkflowUiExperimentalApi
26-
import com.squareup.workflow.ui.LayoutRunner
27-
import com.squareup.workflow.ui.ViewFactory
28-
import com.squareup.workflow.ui.ViewEnvironment
29-
import com.squareup.workflow.ui.WorkflowViewStub
30-
import com.squareup.workflow.ui.backstack.BackStackScreen
25+
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
26+
import com.squareup.workflow1.ui.LayoutRunner
27+
import com.squareup.workflow1.ui.ViewFactory
28+
import com.squareup.workflow1.ui.ViewEnvironment
29+
import com.squareup.workflow1.ui.WorkflowViewStub
30+
import com.squareup.workflow1.ui.backstack.BackStackScreen
3131

3232
/**
3333
* Displays [OverviewDetailScreen] renderings in either split pane or single pane

‎samples/containers/android/src/main/java/com/squareup/sample/container/panel/PanelContainer.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ import android.view.View
2525
import android.view.ViewGroup
2626
import android.view.ViewGroup.LayoutParams.MATCH_PARENT
2727
import com.squareup.sample.container.R
28-
import com.squareup.workflow.ui.BuilderBinding
29-
import com.squareup.workflow.ui.WorkflowUiExperimentalApi
30-
import com.squareup.workflow.ui.ViewFactory
31-
import com.squareup.workflow.ui.bindShowRendering
32-
import com.squareup.workflow.ui.modal.ModalViewContainer
28+
import com.squareup.workflow1.ui.BuilderBinding
29+
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
30+
import com.squareup.workflow1.ui.ViewFactory
31+
import com.squareup.workflow1.ui.bindShowRendering
32+
import com.squareup.workflow1.ui.modal.ModalViewContainer
3333

3434
/**
3535
* Used by Tic Tac Workflow sample to show its [PanelContainerScreen]s.

0 commit comments

Comments
 (0)