author int64 658 755k | date stringlengths 19 19 | timezone int64 -46,800 43.2k | hash stringlengths 40 40 | message stringlengths 5 490 | mods list | language stringclasses 20 values | license stringclasses 3 values | repo stringlengths 5 68 | original_message stringlengths 12 491 |
|---|---|---|---|---|---|---|---|---|---|
652,299 | 25.01.2019 14:55:41 | -10,800 | b76cb34133cce4248fa7fdf4cf204cee73755ab4 | Cross Feature navigation with onActivityResult handling support | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "core-ui/src/main/java/ru/surfstudio/android/core/ui/event/result/CrossFeatureSupportOnActivityResultRoute.java",
"diff": "+/*\n+ Copyright (c) 2018-present, SurfStudio LLC, Maxim Tuev.\n+\n+ Licensed under the Apache License, Version 2.0 (the \"License\");\n+ you may not use this file except in compliance with the License.\n+ You may obtain a copy of the License at\n+\n+ http://www.apache.org/licenses/LICENSE-2.0\n+\n+ Unless required by applicable law or agreed to in writing, software\n+ distributed under the License is distributed on an \"AS IS\" BASIS,\n+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ See the License for the specific language governing permissions and\n+ limitations under the License.\n+ */\n+package ru.surfstudio.android.core.ui.event.result;\n+\n+import java.io.Serializable;\n+\n+/**\n+ * Marker interface for Cross Feature navigation Route with onActivityResult handling support.\n+ *\n+ * @param <T> Intent data type\n+ */\n+public interface CrossFeatureSupportOnActivityResultRoute<T extends Serializable> extends SupportOnActivityResultRoute<T> {\n+ //empty\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "core-ui/src/main/java/ru/surfstudio/android/core/ui/navigation/ActivityRouteInterface.java",
"new_path": "core-ui/src/main/java/ru/surfstudio/android/core/ui/navigation/ActivityRouteInterface.java",
"diff": "@@ -54,6 +54,7 @@ public interface ActivityRouteInterface extends Route {\n* @return prepared Bundle\n* @deprecated use {@link ActivityRouteInterface#prepareActivityOptionsCompat()} instead\n*/\n+ @SuppressWarnings(\"DeprecatedIsStillUsed\")\n@Deprecated\nBundle prepareBundle();\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "core-ui/src/main/java/ru/surfstudio/android/core/ui/navigation/activity/navigator/ActivityNavigator.java",
"new_path": "core-ui/src/main/java/ru/surfstudio/android/core/ui/navigation/activity/navigator/ActivityNavigator.java",
"diff": "@@ -37,6 +37,7 @@ import io.reactivex.subjects.Subject;\nimport ru.surfstudio.android.core.ui.event.ScreenEventDelegateManager;\nimport ru.surfstudio.android.core.ui.event.newintent.NewIntentDelegate;\nimport ru.surfstudio.android.core.ui.event.result.BaseActivityResultDelegate;\n+import ru.surfstudio.android.core.ui.event.result.CrossFeatureSupportOnActivityResultRoute;\nimport ru.surfstudio.android.core.ui.event.result.SupportOnActivityResultRoute;\nimport ru.surfstudio.android.core.ui.navigation.ActivityRouteInterface;\nimport ru.surfstudio.android.core.ui.navigation.Navigator;\n@@ -267,6 +268,52 @@ public abstract class ActivityNavigator extends BaseActivityResultDelegate\nreturn false;\n}\n+ /**\n+ * Launch a new Activity for result from another Feature Module.\n+ * <p>\n+ * Performs asynchronically due to type of the target Feature Module.\n+ * This method returns stream of install state change events. You can make a subscription in\n+ * your Presenter and handle errors or any other type of events during Dynamic Feature\n+ * installation.\n+ *\n+ * @param route navigation route\n+ * @return stream of install state change events\n+ */\n+ public Observable<SplitFeatureInstallState> startForResult(CrossFeatureSupportOnActivityResultRoute route) {\n+ BehaviorSubject<SplitFeatureInstallState> startStatusSubject = BehaviorSubject.create();\n+ if (route instanceof DynamicCrossFeatureRoute && this.isSplitFeatureModeOn) {\n+ DynamicCrossFeatureRoute dynamicCrossFeatureRoute = (DynamicCrossFeatureRoute) route;\n+ splitFeatureInstaller.installFeature(\n+ dynamicCrossFeatureRoute.splitNames(),\n+ new SplitFeatureInstaller.SplitFeatureInstallListener() {\n+ @Override\n+ public void onInstall(@NotNull SplitFeatureInstallState state) {\n+ performStartForResult(route, startStatusSubject);\n+ }\n+\n+ @Override\n+ public void onStateChanged(@NotNull SplitFeatureInstallState state) {\n+ startStatusSubject.onNext(state);\n+ }\n+\n+ @Override\n+ public void onFailure(@NotNull SplitFeatureInstallState state) {\n+ startStatusSubject.onNext(state);\n+ }\n+ }\n+ );\n+ } else {\n+ performStartForResult(route, startStatusSubject);\n+ }\n+ return startStatusSubject.hide();\n+ }\n+\n+ private void performStartForResult(SupportOnActivityResultRoute route, BehaviorSubject<SplitFeatureInstallState> startStatusSubject) {\n+ boolean startupStatus = startForResult(route);\n+ SplitFeatureInstallStatus status = SplitFeatureInstallStatus.Companion.getByValue(startupStatus);\n+ startStatusSubject.onNext(new SplitFeatureInstallState(status));\n+ }\n+\n/**\n* Bundle preparation backward compatible implementation.\n* Handles getting bundle from both {@link ActivityRoute#prepareActivityOptionsCompat()} and\n"
},
{
"change_type": "MODIFY",
"old_path": "core-ui/src/main/java/ru/surfstudio/android/core/ui/navigation/feature/route/dynamic_feature/ActivityDynamicCrossFeatureWithResultRoute.kt",
"new_path": "core-ui/src/main/java/ru/surfstudio/android/core/ui/navigation/feature/route/dynamic_feature/ActivityDynamicCrossFeatureWithResultRoute.kt",
"diff": "package ru.surfstudio.android.core.ui.navigation.feature.route.dynamic_feature\nimport android.content.Intent\n+import ru.surfstudio.android.core.ui.event.result.CrossFeatureSupportOnActivityResultRoute\nimport ru.surfstudio.android.core.ui.event.result.SupportOnActivityResultRoute\nimport java.io.Serializable\n@@ -34,7 +35,7 @@ import java.io.Serializable\n*/\nabstract class ActivityDynamicCrossFeatureWithResultRoute<T : Serializable> :\nActivityDynamicCrossFeatureRoute(),\n- SupportOnActivityResultRoute<T> {\n+ CrossFeatureSupportOnActivityResultRoute<T> {\noverride fun prepareResultIntent(resultData: T): Intent {\nval i = Intent()\n"
},
{
"change_type": "MODIFY",
"old_path": "core-ui/src/main/java/ru/surfstudio/android/core/ui/navigation/feature/route/feature/ActivityCrossFeatureWithResultRoute.kt",
"new_path": "core-ui/src/main/java/ru/surfstudio/android/core/ui/navigation/feature/route/feature/ActivityCrossFeatureWithResultRoute.kt",
"diff": "package ru.surfstudio.android.core.ui.navigation.feature.route.feature\nimport android.content.Intent\n+import ru.surfstudio.android.core.ui.event.result.CrossFeatureSupportOnActivityResultRoute\nimport ru.surfstudio.android.core.ui.event.result.SupportOnActivityResultRoute\nimport ru.surfstudio.android.core.ui.navigation.feature.route.dynamic_feature.ActivityDynamicCrossFeatureRoute\nimport java.io.Serializable\n@@ -32,7 +33,7 @@ import java.io.Serializable\n*/\nabstract class ActivityCrossFeatureWithResultRoute<T : Serializable> :\nActivityCrossFeatureRoute(),\n- SupportOnActivityResultRoute<T> {\n+ CrossFeatureSupportOnActivityResultRoute<T> {\noverride fun prepareResultIntent(resultData: T): Intent {\nval i = Intent()\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-397 Cross Feature navigation with onActivityResult handling support |
652,337 | 25.01.2019 18:40:18 | -18,000 | 1e573ae2d40b703330d1a829af3190559361b874 | Grouping notifications | [
{
"change_type": "MODIFY",
"old_path": "firebase-sample/build.gradle",
"new_path": "firebase-sample/build.gradle",
"diff": "import com.google.gms.googleservices.GoogleServicesPlugin\napply from: '../androidSample.gradle'\n-apply plugin: 'io.fabric'\n+//apply plugin: 'io.fabric'\nandroid {\next.enableCrashlytics = false\n"
},
{
"change_type": "MODIFY",
"old_path": "firebase-sample/src/main/java/ru/surfstudio/android/firebase/sample/ui/common/notification/FirebaseMessagingService.kt",
"new_path": "firebase-sample/src/main/java/ru/surfstudio/android/firebase/sample/ui/common/notification/FirebaseMessagingService.kt",
"diff": "@@ -40,6 +40,7 @@ class FirebaseMessagingService : FirebaseMessagingService() {\nremoteMessage?.let {\npushHandler.handleMessage(this,\n+ it.messageId?.hashCode() ?: -1,\nit.notification?.title ?: \"\",\nit.notification?.body ?: \"\",\nit.data)\n"
},
{
"change_type": "MODIFY",
"old_path": "template/app-injector/src/main/java/ru/surfstudio/standard/app_injector/ui/notification/MessagingService.kt",
"new_path": "template/app-injector/src/main/java/ru/surfstudio/standard/app_injector/ui/notification/MessagingService.kt",
"diff": "@@ -45,6 +45,7 @@ class MessagingService : FirebaseMessagingService() {\nremoteMessage?.let {\npushHandler.handleMessage(this,\n+ it.messageId?.hashCode() ?: -1,\nit.notification?.title ?: \"\",\nit.notification?.body ?: \"\",\nit.data)\n"
},
{
"change_type": "MODIFY",
"old_path": "template/app-injector/src/main/java/ru/surfstudio/standard/app_injector/ui/notification/strategy/BasePushHandleStrategy.kt",
"new_path": "template/app-injector/src/main/java/ru/surfstudio/standard/app_injector/ui/notification/strategy/BasePushHandleStrategy.kt",
"diff": "@@ -4,6 +4,7 @@ import android.app.Activity\nimport android.app.PendingIntent\nimport android.content.Context\nimport android.content.Intent\n+import ru.surfstudio.android.notification.ui.notification.groups.NotificationsGroup\nimport ru.surfstudio.android.notification.ui.notification.strategies.SimpleAbstractPushHandleStrategy\nimport ru.surfstudio.android.template.app_injector.R\nimport ru.surfstudio.standard.app_injector.ui.notification.type.NotificationTypeData\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-316 Grouping notifications |
652,304 | 29.01.2019 15:35:20 | -10,800 | 7d9fc39a01085eb568f65b244c336ec9d25b5f27 | LoadState -> LoadStateInterface | [
{
"change_type": "MODIFY",
"old_path": "core-mvp-rx-sample/src/main/java/ru/surfstudio/android/core/mvp/rx/sample/easyadapter/ui/screen/pagination/PaginationActivityView.kt",
"new_path": "core-mvp-rx-sample/src/main/java/ru/surfstudio/android/core/mvp/rx/sample/easyadapter/ui/screen/pagination/PaginationActivityView.kt",
"diff": "@@ -89,15 +89,15 @@ class PaginationActivityView : BaseRxActivityView<PaginationPresentationModel>()\n::createItemList) bindTo { p -> adapter.setItems(p.first, p.second) }\n}\n- private fun createItemList(loadState: LS,\n+ private fun createItemList(loadState: LoadState,\nelements: DataList<SelectableData<Element>>,\nstubs: List<Stub>,\npaginationState: PaginationState): Pair<ItemList, PaginationState> {\nval itemList = when (loadState) {\n- LS.LOADING -> ItemList.create(stubs, stubController)\n- LS.ERROR -> ItemList.create(errorStateController)\n- LS.EMPTY -> ItemList.create(emptyStateController)\n- LS.NONE -> ItemList.create(elements, elementController)\n+ Loading -> ItemList.create(stubs, stubController)\n+ Error -> ItemList.create(errorStateController)\n+ Empty -> ItemList.create(emptyStateController)\n+ None -> ItemList.create(elements, elementController)\n}\nreturn itemList to paginationState\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "core-mvp-rx-sample/src/main/java/ru/surfstudio/android/core/mvp/rx/sample/easyadapter/ui/screen/pagination/PaginationPresentationModel.kt",
"new_path": "core-mvp-rx-sample/src/main/java/ru/surfstudio/android/core/mvp/rx/sample/easyadapter/ui/screen/pagination/PaginationPresentationModel.kt",
"diff": "package ru.surfstudio.android.core.mvp.rx.sample.easyadapter.ui.screen.pagination\n+import ru.surfstudio.android.core.mvp.loadstate.LoadStateInterface\nimport ru.surfstudio.android.core.mvp.model.ScreenModel\nimport ru.surfstudio.android.core.mvp.rx.relation.mvp.Action\nimport ru.surfstudio.android.core.mvp.rx.relation.mvp.State\n@@ -33,15 +34,16 @@ class PaginationPresentationModel : ScreenModel() {\nval elementsState = State<DataList<SelectableData<Element>>>(DataList.empty())\nval stubsState = State(generateStubs(20))\n- val loadState = State(LS.NONE)\n+ val loadState = State<LoadState>(None)\nval paginationState = State(PaginationState.READY)\nvar hasData = false\n}\n-enum class LS {\n- LOADING,\n- ERROR,\n- EMPTY,\n- NONE\n-}\n+sealed class LoadState : LoadStateInterface\n+\n+object Loading : LoadState()\n+object Error : LoadState()\n+object Empty : LoadState()\n+object None : LoadState()\n+\n"
},
{
"change_type": "MODIFY",
"old_path": "core-mvp-rx-sample/src/main/java/ru/surfstudio/android/core/mvp/rx/sample/easyadapter/ui/screen/pagination/PaginationPresenter.kt",
"new_path": "core-mvp-rx-sample/src/main/java/ru/surfstudio/android/core/mvp/rx/sample/easyadapter/ui/screen/pagination/PaginationPresenter.kt",
"diff": "@@ -118,15 +118,12 @@ class PaginationPresenter @Inject constructor(\n}\nprivate fun setNormalLoadState(elements: DataList<*>) {\n- pm.loadState.accept(if (elements.isEmpty())\n- LS.EMPTY else\n- LS.NONE)\n+ pm.loadState.accept(if (elements.isEmpty()) Empty else None)\n}\nprivate fun setErrorLoadState(elements: DataList<*>) {\npm.loadState.accept(if (elements.isEmpty())\n- LS.ERROR else\n- LS.NONE)\n+ Error else None)\n}\nprivate fun setNormalPaginationState(elements: DataList<*>) {\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-227 LoadState -> LoadStateInterface |
652,340 | 29.01.2019 15:39:59 | -10,800 | eb28039c070d33b5580933cdd8baf6a19c4d91c7 | add possibility to change text on buttons | [
{
"change_type": "MODIFY",
"old_path": "core-ui/src/main/java/ru/surfstudio/android/core/ui/permission/screens/settings_rational/DefaultSettingsRationalActivity.kt",
"new_path": "core-ui/src/main/java/ru/surfstudio/android/core/ui/permission/screens/settings_rational/DefaultSettingsRationalActivity.kt",
"diff": "@@ -19,18 +19,26 @@ class DefaultSettingsRationalActivity : AppCompatActivity() {\nprivate val settingsRationalStr: String\nget() = intent.getStringExtra(Route.EXTRA_FIRST)\n+ private val settingsPositiveButtonStr: String\n+ get() = intent.getStringExtra(Route.EXTRA_SECOND)\n+ ?: getString(R.string.settings_rational_go_to_settings)\n+\n+ private val settingsNegativeButtonStr: String\n+ get() = intent.getStringExtra(Route.EXTRA_FIRST)\n+ ?: getString(R.string.settings_rational_cancel)\n+\noverride fun onCreate(savedInstanceState: Bundle?) {\nsuper.onCreate(savedInstanceState)\nAlertDialog\n.Builder(this)\n.setMessage(settingsRationalStr)\n- .setPositiveButton(R.string.settings_rational_go_to_settings) { _, _ ->\n+ .setPositiveButton(settingsPositiveButtonStr) { _, _ ->\nval settingsUri = Uri.fromParts(\"package\", packageName, null)\nval settingsIntent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS, settingsUri)\nstartActivityForResult(settingsIntent, SETTINGS_REQUEST_CODE)\n}\n- .setNegativeButton(R.string.settings_rational_cancel, null)\n+ .setNegativeButton(settingsNegativeButtonStr, null)\n.setOnDismissListener { finish() }\n.create()\n.show()\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | add possibility to change text on buttons |
652,337 | 04.02.2019 17:18:11 | -18,000 | a092612ab8c47b90e004fdaf480b05d0cac8704b | Added data to intents | [
{
"change_type": "MODIFY",
"old_path": "push/src/main/java/ru/surfstudio/android/notification/ui/notification/NotificationClickEventReceiver.kt",
"new_path": "push/src/main/java/ru/surfstudio/android/notification/ui/notification/NotificationClickEventReceiver.kt",
"diff": "@@ -6,6 +6,7 @@ import android.content.Intent\nimport ru.surfstudio.android.logger.Logger\nimport ru.surfstudio.android.notification.interactor.PushClickProvider\n+const val NOTIFICATION_DATA = \"notification_data\"\ninternal const val NOTIFICATION_GROUP_ID = \"notification_group_id\"\ninternal const val EVENT_TYPE = \"event_type\"\n"
},
{
"change_type": "MODIFY",
"old_path": "push/src/main/java/ru/surfstudio/android/notification/ui/notification/strategies/PushHandleStrategy.kt",
"new_path": "push/src/main/java/ru/surfstudio/android/notification/ui/notification/strategies/PushHandleStrategy.kt",
"diff": "@@ -210,6 +210,7 @@ abstract class PushHandleStrategy<out T : BaseNotificationTypeData<*>> : Seriali\n*/\nprivate fun preparePendingIntent(context: Context, title: String, groupId: Int?): PendingIntent {\nval intent = Intent(context, NotificationClickEventReceiver::class.java)\n+ intent.putExtra(NOTIFICATION_DATA, typeData)\nintent.putExtra(EVENT_TYPE, Event.OPEN)\nintent.putExtra(NOTIFICATION_GROUP_ID, groupId ?: 0)\nreturn PendingIntent.getBroadcast(context.applicationContext,\n@@ -218,6 +219,7 @@ abstract class PushHandleStrategy<out T : BaseNotificationTypeData<*>> : Seriali\nprivate fun makeDeleteIntent(context: Context, groupId: Int?): PendingIntent {\nval intent = Intent(context, NotificationClickEventReceiver::class.java)\n+ intent.putExtra(NOTIFICATION_DATA, typeData)\nintent.putExtra(EVENT_TYPE, Event.DISMISS)\nintent.putExtra(NOTIFICATION_GROUP_ID, groupId ?: 0)\nreturn PendingIntent.getBroadcast(context.applicationContext,\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-316 Added data to intents |
652,299 | 05.02.2019 14:33:38 | -10,800 | 6d34373fb643697ca4c820a619ec0b9f44b5dae4 | SBI project snapshot initialization. | [
{
"change_type": "MODIFY",
"old_path": "config.gradle",
"new_path": "config.gradle",
"diff": "@@ -2,10 +2,10 @@ ext {\napplicationName = \"AndroidStandard\"\napplicationId = \"ru.surfstudio.android.template\"\n- moduleVersionCode = 20\n- moduleVersionName = '0.4.0-SNAPSHOT'\n- libMinSdkVersion = 17\n- sampleMinSdkVersion = 18\n+ moduleVersionCode = 1\n+ moduleVersionName = '0.3.0-SBI-0-SNAPSHOT'\n+ libMinSdkVersion = 21\n+ sampleMinSdkVersion = 21\ntargetSdkVersion = 28\ncompileSdkVersion = 28\ndebugVersionNameSuffix = \".debug\"\n"
},
{
"change_type": "MODIFY",
"old_path": "template/config.gradle",
"new_path": "template/config.gradle",
"diff": "@@ -4,7 +4,7 @@ ext {\nversionCode = 1\nversionName = \"0.0.1\"\n- minSdkVersion = 17\n+ minSdkVersion = 21\ntargetSdkVersion = 28\ncompileSdkVersion = 28\ndebugVersionNameSuffix = \".debug\"\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | SBI project snapshot initialization. |
652,335 | 05.02.2019 14:35:39 | -10,800 | 3bca64c5949b53cac7500976caf899d4fa1da574 | Increase version to 0.3.0-SBI-1-SNAPSHOT [skip ci] [version] | [
{
"change_type": "MODIFY",
"old_path": "config.gradle",
"new_path": "config.gradle",
"diff": "@@ -3,7 +3,7 @@ ext {\napplicationId = \"ru.surfstudio.android.template\"\nmoduleVersionCode = 1\n- moduleVersionName = '0.3.0-SBI-0-SNAPSHOT'\n+ moduleVersionName = '0.3.0-SBI-1-SNAPSHOT'\nlibMinSdkVersion = 21\nsampleMinSdkVersion = 21\ntargetSdkVersion = 28\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Increase version to 0.3.0-SBI-1-SNAPSHOT [skip ci] [version] |
652,335 | 05.02.2019 17:10:29 | -10,800 | 58f15c032faf0bc1ea690b40ddcc36c81f71c687 | Increase version to 0.4.0-SBI-2-SNAPSHOT [skip ci] [version] | [
{
"change_type": "MODIFY",
"old_path": "config.gradle",
"new_path": "config.gradle",
"diff": "@@ -3,7 +3,7 @@ ext {\napplicationId = \"ru.surfstudio.android.template\"\nmoduleVersionCode = 1\n- moduleVersionName = '0.4.0-SBI-1-SNAPSHOT'\n+ moduleVersionName = '0.4.0-SBI-2-SNAPSHOT'\nlibMinSdkVersion = 21\nsampleMinSdkVersion = 21\ntargetSdkVersion = 28\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Increase version to 0.4.0-SBI-2-SNAPSHOT [skip ci] [version] |
652,314 | 08.02.2019 11:54:21 | -10,800 | f4e25385c79fe39a0d9aaa6209fea8ff05ad58ac | Fix instrumental tests | [
{
"change_type": "MODIFY",
"old_path": "template/small-test-utils/build.gradle",
"new_path": "template/small-test-utils/build.gradle",
"diff": "@@ -16,3 +16,11 @@ dependencies {\nimplementation \"com.google.dagger:dagger:$daggerVersion\"\nkapt \"com.google.dagger:dagger-compiler:$daggerVersion\"\n}\n+\n+gradle.taskGraph.whenReady {\n+ gradle.taskGraph.allTasks.each {\n+ if (it.project == project && gradle.taskGraph.allTasks.find { it.name == \"assembleAndroidTest\" } != null) {\n+ it.onlyIf { false }\n+ }\n+ }\n+}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Fix instrumental tests |
652,337 | 11.02.2019 12:50:42 | -18,000 | c93cb75be3fad73a3b25b4b652bde9ea935449a5 | added method for group summary | [
{
"change_type": "MODIFY",
"old_path": "push/src/main/java/ru/surfstudio/android/notification/ui/notification/NotificationCreateHelper.kt",
"new_path": "push/src/main/java/ru/surfstudio/android/notification/ui/notification/NotificationCreateHelper.kt",
"diff": "@@ -58,7 +58,7 @@ object NotificationCreateHelper {\nnotificationDescObject.forEach { inboxStyle.addLine(it) }\n//Can set no.of messages as a summary.\n- inboxStyle.setSummaryText(notificationDescObject.size.toString() + \" Messages\") //todo\n+ inboxStyle.setSummaryText(pushHandleStrategy.makeGroupSummary(notificationDescObject.size))\n}\ngetNotificationManager(context).notify(groupId, notificationBuilder.build())\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | added method for group summary |
652,337 | 11.02.2019 15:50:05 | -18,000 | c01fe5c9727d7caeb2b90f1b4b99e7aade62925a | pr fixes - documentation changed | [
{
"change_type": "MODIFY",
"old_path": "core-ui/build.gradle",
"new_path": "core-ui/build.gradle",
"diff": "@@ -11,6 +11,5 @@ dependencies {\ngradle.ext.configAndroidStandardDependencies(this, [\n'logger',\n'rx-extension',\n- 'core-app',\n'activity-holder'\n])\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "push/src/main/java/ru/surfstudio/android/notification/ui/notification/NotificationCreateHelper.kt",
"new_path": "push/src/main/java/ru/surfstudio/android/notification/ui/notification/NotificationCreateHelper.kt",
"diff": "@@ -42,26 +42,8 @@ object NotificationCreateHelper {\nif (android.os.Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) {\n- val groupId = pushHandleStrategy.group?.id\n- if (groupId != null) {\n- val notificationDescObject = NotificationGroupHelper\n- .getNotificationsForGroup(context, groupId, body)\n-\n- if (notificationDescObject.size > 1) {\n-\n- val inboxStyle = NotificationCompat.InboxStyle()\n-\n- notificationBuilder.setStyle(inboxStyle)\n-\n- inboxStyle.setBigContentTitle(title)\n-\n- notificationDescObject.forEach { inboxStyle.addLine(it) }\n-\n- //Can set no.of messages as a summary.\n- inboxStyle.setSummaryText(pushHandleStrategy.makeGroupSummary(notificationDescObject.size))\n- }\n-\n- getNotificationManager(context).notify(groupId, notificationBuilder.build())\n+ pushHandleStrategy.group?.id?.let {\n+ makeGroupNotificationM(context, notificationBuilder, pushHandleStrategy, it, body, title)\nreturn\n}\n} else {\n@@ -140,4 +122,32 @@ object NotificationCreateHelper {\nprivate fun getNotificationManager(context: Context): NotificationManager {\nreturn context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager\n}\n+\n+ private fun makeGroupNotificationM(\n+ context: Context,\n+ notificationBuilder: NotificationCompat.Builder,\n+ pushHandleStrategy: PushHandleStrategy<*>,\n+ groupId: Int,\n+ body: String,\n+ title: String\n+ ) {\n+ val notificationDescObject = NotificationGroupHelper\n+ .getNotificationsForGroup(context, groupId, body)\n+\n+ if (notificationDescObject.size > 1) {\n+\n+ val inboxStyle = NotificationCompat.InboxStyle()\n+\n+ notificationBuilder.setStyle(inboxStyle)\n+\n+ inboxStyle.setBigContentTitle(title)\n+\n+ notificationDescObject.forEach { inboxStyle.addLine(it) }\n+\n+ //Can set no.of messages as a summary.\n+ inboxStyle.setSummaryText(pushHandleStrategy.makeGroupSummary(notificationDescObject.size))\n+ }\n+\n+ getNotificationManager(context).notify(groupId, notificationBuilder.build())\n+ }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "push/src/main/java/ru/surfstudio/android/notification/ui/notification/NotificationGroupHelper.kt",
"new_path": "push/src/main/java/ru/surfstudio/android/notification/ui/notification/NotificationGroupHelper.kt",
"diff": "@@ -6,7 +6,7 @@ import org.json.JSONArray\nimport ru.surfstudio.android.utilktx.ktx.text.EMPTY_STRING\n/**\n- *\n+ * Helper class for Grouping notifications for API version <= M\n*/\ninternal object NotificationGroupHelper {\n@@ -32,6 +32,9 @@ internal object NotificationGroupHelper {\nreturn notificationObject\n}\n+ /**\n+ * This method will clear cached notifications for given group\n+ */\nfun clearSavedNotificationsForGroup(context: Context, groupId: Int) {\nval sp = getSharedPref(context)\nsp.edit().putString(getGroupKey(groupId), EMPTY_STRING).apply()\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | pr fixes - documentation changed |
652,353 | 17.02.2019 17:15:54 | -10,800 | 45629c8f0e9564f31011b5ab6718ec699617dbaf | Updated branch and sample | [
{
"change_type": "MODIFY",
"old_path": "imageloader-sample/src/main/res/layout/activity_main.xml",
"new_path": "imageloader-sample/src/main/res/layout/activity_main.xml",
"diff": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n-<FrameLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\n+<LinearLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\nxmlns:tools=\"http://schemas.android.com/tools\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"match_parent\"\n+ android:orientation=\"vertical\"\ntools:context=\".MainActivity\">\n+ <ImageView\n+ android:id=\"@+id/imageloader_sample_svg_iv\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"0dp\"\n+ android:layout_gravity=\"center\"\n+ android:layout_weight=\"0.5\"\n+ android:background=\"@color/colorPrimary\"\n+ android:contentDescription=\"@string/content_description\"\n+ android:padding=\"16dp\"\n+ tools:src=\"@drawable/a123321\" />\n+\n+ <FrameLayout\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"0dp\"\n+ android:layout_weight=\"0.5\">\n+\n<ImageView\nandroid:id=\"@+id/imageloader_sample_iv\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"match_parent\"\n- android:src=\"@drawable/a123321\"\n- android:contentDescription=\"@string/content_description\" />\n+ android:contentDescription=\"@string/content_description\"\n+ android:src=\"@drawable/a123321\" />\n+\n<Button\nandroid:id=\"@+id/image_loader_sample_btn\"\nandroid:layout_width=\"200dp\"\nandroid:layout_height=\"100dp\"\n- android:text=\"@string/app_name\"\nandroid:layout_gravity=\"bottom|center_horizontal\"\n- android:layout_margin=\"32dp\"/>\n+ android:layout_margin=\"32dp\"\n+ android:text=\"@string/app_name\" />\n</FrameLayout>\n+\n+</LinearLayout>\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-306 Updated branch and sample |
652,299 | 18.02.2019 18:18:44 | -10,800 | 9d76ab7bf20077e602a3fe9ae65cabfc66883091 | Cross feature installer Rx improvements | [
{
"change_type": "MODIFY",
"old_path": "core-ui/build.gradle",
"new_path": "core-ui/build.gradle",
"diff": "@@ -6,6 +6,7 @@ dependencies {\nimplementation \"com.google.android.play:core:$playCoreVersion\" //for split install features support\nimplementation \"androidx.annotation:annotation:$androidxAnnotationVersion\"\nimplementation \"com.annimon:stream:$annimonStreamVersion\"\n+ implementation \"com.agna.ferro:ferro-rx:$ferroRxVersion\"\n}\ngradle.ext.configAndroidStandardDependencies(this, [\n"
},
{
"change_type": "MODIFY",
"old_path": "core-ui/src/main/java/ru/surfstudio/android/core/ui/navigation/feature/installer/SplitFeatureEvent.kt",
"new_path": "core-ui/src/main/java/ru/surfstudio/android/core/ui/navigation/feature/installer/SplitFeatureEvent.kt",
"diff": "+/*\n+ Copyright (c) 2018-present, SurfStudio LLC, Maxim Tuev.\n+\n+ Licensed under the Apache License, Version 2.0 (the \"License\");\n+ you may not use this file except in compliance with the License.\n+ You may obtain a copy of the License at\n+\n+ http://www.apache.org/licenses/LICENSE-2.0\n+\n+ Unless required by applicable law or agreed to in writing, software\n+ distributed under the License is distributed on an \"AS IS\" BASIS,\n+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ See the License for the specific language governing permissions and\n+ limitations under the License.\n+ */\npackage ru.surfstudio.android.core.ui.navigation.feature.installer\n/**\n"
},
{
"change_type": "MODIFY",
"old_path": "core-ui/src/main/java/ru/surfstudio/android/core/ui/navigation/feature/installer/SplitFeatureInstaller.kt",
"new_path": "core-ui/src/main/java/ru/surfstudio/android/core/ui/navigation/feature/installer/SplitFeatureInstaller.kt",
"diff": "@@ -6,6 +6,8 @@ import com.google.android.play.core.splitinstall.SplitInstallManagerFactory\nimport com.google.android.play.core.splitinstall.SplitInstallRequest\nimport com.google.android.play.core.splitinstall.model.SplitInstallErrorCode\nimport com.google.android.play.core.splitinstall.model.SplitInstallSessionStatus\n+import io.reactivex.Observable\n+import io.reactivex.subjects.BehaviorSubject\n/**\n* Dynamic Feature install manager.\n@@ -13,12 +15,7 @@ import com.google.android.play.core.splitinstall.model.SplitInstallSessionStatus\nclass SplitFeatureInstaller(\napplicationContext: Context\n) {\n-\n- interface SplitFeatureInstallListener {\n- fun onInstall(state: SplitFeatureInstallState)\n- fun onStateChanged(state: SplitFeatureInstallState)\n- fun onFailure(state: SplitFeatureInstallState)\n- }\n+ private val splitFeatureInstallSubject = BehaviorSubject.create<SplitFeatureInstallState>()\nprivate val splitInstallManager = SplitInstallManagerFactory.create(applicationContext)\n@@ -32,11 +29,8 @@ class SplitFeatureInstaller(\n* @param splitFeatureInstallListener installation events listener\n*/\n@Suppress(\"unused\")\n- fun installFeature(\n- splitName: String,\n- splitFeatureInstallListener: SplitFeatureInstallListener\n- ) {\n- installFeature(listOf(splitName), splitFeatureInstallListener)\n+ fun installFeature(splitName: String) {\n+ installFeature(listOf(splitName))\n}\n/**\n@@ -45,10 +39,7 @@ class SplitFeatureInstaller(\n* @param splitNames multiple Dynamic Feature names\n* @param splitFeatureInstallListener installation events listener\n*/\n- fun installFeature(\n- splitNames: List<String>,\n- splitFeatureInstallListener: SplitFeatureInstallListener\n- ) {\n+ fun installFeature(splitNames: List<String>): Observable<SplitFeatureInstallState> {\nval requestBuilder = SplitInstallRequest.newBuilder()\nfor (splitName in splitNames) {\nrequestBuilder.addModule(splitName)\n@@ -59,25 +50,25 @@ class SplitFeatureInstaller(\nif (state?.sessionId() == -1 &&\nstate.status() == SplitInstallSessionStatus.FAILED &&\nstate.errorCode() == SplitInstallErrorCode.SERVICE_DIED) {\n- splitFeatureInstallListener.onFailure(\n+ splitFeatureInstallSubject.onNext(\nSplitFeatureInstallState(SplitFeatureEvent.StartupFailure.ServiceDied)\n)\n} else if (state?.sessionId() == this@SplitFeatureInstaller.sessionId) {\nwhen {\nstate.status() == SplitInstallSessionStatus.PENDING ->\n- splitFeatureInstallListener.onStateChanged(\n+ splitFeatureInstallSubject.onNext(\nSplitFeatureInstallState(\nSplitFeatureEvent.InstallationStateEvent.Pending\n)\n)\nstate.status() == SplitInstallSessionStatus.REQUIRES_USER_CONFIRMATION ->\n- splitFeatureInstallListener.onStateChanged(\n+ splitFeatureInstallSubject.onNext(\nSplitFeatureInstallState(\nSplitFeatureEvent.InstallationStateEvent.RequiresUserConfirmation\n)\n)\nstate.status() == SplitInstallSessionStatus.DOWNLOADING ->\n- splitFeatureInstallListener.onStateChanged(\n+ splitFeatureInstallSubject.onNext(\nSplitFeatureInstallState(\nSplitFeatureEvent.InstallationStateEvent.Downloading(\nstate.totalBytesToDownload(),\n@@ -86,46 +77,46 @@ class SplitFeatureInstaller(\n)\n)\nstate.status() == SplitInstallSessionStatus.DOWNLOADED ->\n- splitFeatureInstallListener.onStateChanged(\n+ splitFeatureInstallSubject.onNext(\nSplitFeatureInstallState(\nSplitFeatureEvent.InstallationStateEvent.Downloaded\n)\n)\nstate.status() == SplitInstallSessionStatus.INSTALLING ->\n- splitFeatureInstallListener.onStateChanged(\n+ splitFeatureInstallSubject.onNext(\nSplitFeatureInstallState(\nSplitFeatureEvent.InstallationStateEvent.Installing\n)\n)\nstate.status() == SplitInstallSessionStatus.INSTALLED -> {\n- splitFeatureInstallListener.onInstall(\n+ splitFeatureInstallSubject.onNext(\nSplitFeatureInstallState(\nSplitFeatureEvent.InstallationStateEvent.Installed\n)\n)\n}\nstate.status() == SplitInstallSessionStatus.FAILED -> {\n- splitFeatureInstallListener.onFailure(\n+ splitFeatureInstallSubject.onNext(\nSplitFeatureInstallState(\nSplitFeatureEvent.InstallationStateEvent.Failed\n)\n)\n}\nstate.status() == SplitInstallSessionStatus.CANCELING ->\n- splitFeatureInstallListener.onStateChanged(\n+ splitFeatureInstallSubject.onNext(\nSplitFeatureInstallState(\nSplitFeatureEvent.InstallationStateEvent.Cancelling\n)\n)\nstate.status() == SplitInstallSessionStatus.CANCELED -> {\n- splitFeatureInstallListener.onFailure(\n+ splitFeatureInstallSubject.onNext(\nSplitFeatureInstallState(\nSplitFeatureEvent.InstallationStateEvent.Canceled\n)\n)\n}\nelse -> {\n- splitFeatureInstallListener.onFailure(\n+ splitFeatureInstallSubject.onNext(\nSplitFeatureInstallState(\nSplitFeatureEvent.InstallationStateEvent.UnknownEvent(\nstate.status()\n@@ -135,7 +126,7 @@ class SplitFeatureInstaller(\n}\n}\n} else {\n- splitFeatureInstallListener.onStateChanged(\n+ splitFeatureInstallSubject.onNext(\nSplitFeatureInstallState(\nSplitFeatureEvent.InstallationStateEvent.AlienSessionEvent(\nstate?.sessionId() ?: -1\n@@ -148,7 +139,7 @@ class SplitFeatureInstaller(\n.startInstall(request)\n.addOnSuccessListener { sessionId ->\nthis@SplitFeatureInstaller.sessionId = sessionId ?: -1\n- splitFeatureInstallListener.onStateChanged(\n+ splitFeatureInstallSubject.onNext(\nSplitFeatureInstallState(\nSplitFeatureEvent.StartupSuccess\n)\n@@ -156,7 +147,7 @@ class SplitFeatureInstaller(\n}\n.addOnFailureListener { exception ->\nif (exception is SplitInstallException) {\n- splitFeatureInstallListener.onFailure(\n+ splitFeatureInstallSubject.onNext(\nwhen {\nexception.errorCode == SplitInstallErrorCode.ACTIVE_SESSIONS_LIMIT_EXCEEDED ->\nSplitFeatureInstallState(\n@@ -202,5 +193,6 @@ class SplitFeatureInstaller(\n)\n}\n}\n+ return splitFeatureInstallSubject\n}\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-419 Cross feature installer Rx improvements |
652,304 | 20.02.2019 13:22:01 | -10,800 | 455492dfa59f6d35467d5a77eac0177caa00dcf6 | Fix update filter length | [
{
"change_type": "MODIFY",
"old_path": "util-ktx/src/main/java/ru/surfstudio/android/utilktx/ktx/ui/view/TextViewExtensions.kt",
"new_path": "util-ktx/src/main/java/ru/surfstudio/android/utilktx/ktx/ui/view/TextViewExtensions.kt",
"diff": "/*\n- Copyright (c) 2018-present, SurfStudio LLC.\n-\n- Licensed under the Apache License, Version 2.0 (the \"License\");\n- you may not use this file except in compliance with the License.\n- You may obtain a copy of the License at\n-\n- http://www.apache.org/licenses/LICENSE-2.0\n-\n- Unless required by applicable law or agreed to in writing, software\n- distributed under the License is distributed on an \"AS IS\" BASIS,\n- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n- See the License for the specific language governing permissions and\n- limitations under the License.\n+ * Copyright (c) 2019-present, SurfStudio LLC.\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n*/\npackage ru.surfstudio.android.utilktx.ktx.ui.view\n@@ -20,13 +20,13 @@ import android.content.ClipboardManager\nimport android.content.Context\nimport android.graphics.PorterDuff\nimport android.graphics.PorterDuffColorFilter\n+import android.text.InputFilter\n+import android.widget.EditText\n+import android.widget.TextView\nimport androidx.annotation.ColorRes\nimport androidx.annotation.IntegerRes\nimport androidx.annotation.StyleRes\nimport androidx.core.content.ContextCompat\n-import android.text.InputFilter\n-import android.widget.EditText\n-import android.widget.TextView\nimport ru.surfstudio.android.utilktx.ktx.text.PHONE_NUMBER_CHARS\nimport ru.surfstudio.android.utilktx.util.KeyboardUtil\nimport ru.surfstudio.android.utilktx.util.SdkUtils\n@@ -84,7 +84,11 @@ fun TextView.copyTextToClipboard() {\n*/\nfun EditText.setMaxLength(@IntegerRes length: Int) {\nval inputTextFilter = InputFilter.LengthFilter(context.resources.getInteger(length))\n- this.filters = arrayOf<InputFilter>(inputTextFilter) + filters\n+\n+ filters = filters\n+ .filterNot { it is InputFilter.LengthFilter }\n+ .toTypedArray()\n+ .plus(inputTextFilter)\n}\n/**\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Fix update filter length |
652,353 | 21.02.2019 20:47:00 | -10,800 | deb13a74496e7f6a87b34ccd3c5d13eb3a32dfab | Moved from module to sample for local use | [
{
"change_type": "RENAME",
"old_path": "imageloader/src/main/java/ru/surfstudio/android/imageloader/svg/SvgDecoder.kt",
"new_path": "imageloader-sample/src/main/java/ru/surfstudio/android/imageloader_sample/svg/SvgDecoder.kt",
"diff": "-package ru.surfstudio.android.imageloader.svg\n+package ru.surfstudio.android.imageloader_sample.svg\nimport com.bumptech.glide.load.Options\nimport com.bumptech.glide.load.ResourceDecoder\n"
},
{
"change_type": "RENAME",
"old_path": "imageloader/src/main/java/ru/surfstudio/android/imageloader/svg/SvgDrawableTranscoder.kt",
"new_path": "imageloader-sample/src/main/java/ru/surfstudio/android/imageloader_sample/svg/SvgDrawableTranscoder.kt",
"diff": "-package ru.surfstudio.android.imageloader.svg\n+package ru.surfstudio.android.imageloader_sample.svg\nimport android.graphics.Picture\nimport android.graphics.drawable.PictureDrawable\n"
},
{
"change_type": "RENAME",
"old_path": "imageloader/src/main/java/ru/surfstudio/android/imageloader/svg/SvgModule.kt",
"new_path": "imageloader-sample/src/main/java/ru/surfstudio/android/imageloader_sample/svg/SvgModule.kt",
"diff": "-package ru.surfstudio.android.imageloader.svg\n+package ru.surfstudio.android.imageloader_sample.svg\nimport android.content.Context\nimport android.graphics.drawable.PictureDrawable\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-306 Moved from module to sample for local use |
652,337 | 22.02.2019 17:12:55 | -18,000 | 9a45ac13a0c4a7458034c2f5606aa1d60799853a | debug codes removed | [
{
"change_type": "MODIFY",
"old_path": "firebase-sample/build.gradle",
"new_path": "firebase-sample/build.gradle",
"diff": "@@ -25,9 +25,9 @@ dependencies {\nimplementation \"com.google.firebase:firebase-messaging:$firebaseMessagingVersion\"\n-// implementation(\"com.crashlytics.sdk.android:crashlytics:$crashlyticsVersion@aar\") {\n-// transitive = true\n-// }\n+ implementation(\"com.crashlytics.sdk.android:crashlytics:$crashlyticsVersion@aar\") {\n+ transitive = true\n+ }\n}\napply plugin: 'com.google.gms.google-services'\n"
},
{
"change_type": "MODIFY",
"old_path": "firebase-sample/src/main/java/ru/surfstudio/android/firebase/sample/app/CustomApp.kt",
"new_path": "firebase-sample/src/main/java/ru/surfstudio/android/firebase/sample/app/CustomApp.kt",
"diff": "@@ -4,9 +4,9 @@ import android.app.Activity\nimport android.content.Context\nimport android.content.Intent\nimport androidx.multidex.MultiDexApplication\n-//import com.crashlytics.android.Crashlytics\n-//import com.crashlytics.android.core.CrashlyticsCore\n-//import io.fabric.sdk.android.Fabric\n+import com.crashlytics.android.Crashlytics\n+import com.crashlytics.android.core.CrashlyticsCore\n+import io.fabric.sdk.android.Fabric\nimport ru.surfstudio.android.activity.holder.ActiveActivityHolder\nimport ru.surfstudio.android.firebase.sample.BuildConfig\nimport ru.surfstudio.android.logger.Logger\n@@ -23,22 +23,22 @@ class CustomApp : MultiDexApplication() {\noverride fun onCreate() {\nsuper.onCreate()\n-// initFabric()\n+ initFabric()\ninitInjector()\ninitNotificationCenter()\nregisterActiveActivityListener()\ninitPushEventListener()\n}\n-// private fun initFabric() {\n-// Fabric.with(this, *getFabricKits())\n-// }\n-//\n-// private fun getFabricKits() = arrayOf(Crashlytics.Builder()\n-// .core(CrashlyticsCore.Builder()\n-// .disabled(BuildConfig.DEBUG)\n-// .build())\n-// .build())\n+ private fun initFabric() {\n+ Fabric.with(this, *getFabricKits())\n+ }\n+\n+ private fun getFabricKits() = arrayOf(Crashlytics.Builder()\n+ .core(CrashlyticsCore.Builder()\n+ .disabled(BuildConfig.DEBUG)\n+ .build())\n+ .build())\nprivate fun initInjector() {\nAppConfigurator.initInjector(this)\n"
},
{
"change_type": "MODIFY",
"old_path": "logger/build.gradle",
"new_path": "logger/build.gradle",
"diff": "@@ -2,7 +2,7 @@ apply from: '../androidModule.gradle'\ndependencies {\napi \"com.jakewharton.timber:timber:$timberVersion\"\n-// api \"com.crashlytics.sdk.android:crashlytics:$crashlyticsVersion\"\n+ api \"com.crashlytics.sdk.android:crashlytics:$crashlyticsVersion\"\nimplementation \"androidx.annotation:annotation:$androidxAnnotationVersion\"\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "logger/src/main/java/ru/surfstudio/android/logger/remote_logging_strategies/impl/crashlytics/CrashlyticsRemoteLoggingStrategy.kt",
"new_path": "logger/src/main/java/ru/surfstudio/android/logger/remote_logging_strategies/impl/crashlytics/CrashlyticsRemoteLoggingStrategy.kt",
"diff": "package ru.surfstudio.android.logger.remote_logging_strategies.impl.crashlytics\n-//import com.crashlytics.android.Crashlytics\n+import com.crashlytics.android.Crashlytics\nimport ru.surfstudio.android.logger.remote_logging_strategies.RemoteLoggingStrategy\n@@ -11,9 +11,9 @@ class CrashlyticsRemoteLoggingStrategy : RemoteLoggingStrategy {\noverride fun setUser(id: String?, username: String?, email: String?) {\ntry {\n-// Crashlytics.getInstance().core.setUserName(username)\n-// Crashlytics.getInstance().core.setUserEmail(email)\n-// Crashlytics.getInstance().core.setUserIdentifier(id)\n+ Crashlytics.getInstance().core.setUserName(username)\n+ Crashlytics.getInstance().core.setUserEmail(email)\n+ Crashlytics.getInstance().core.setUserIdentifier(id)\n} catch (e: Exception) {\n//ignored\n}\n@@ -21,9 +21,9 @@ class CrashlyticsRemoteLoggingStrategy : RemoteLoggingStrategy {\noverride fun clearUser() {\ntry {\n-// Crashlytics.getInstance().core.setUserName(\"\")\n-// Crashlytics.getInstance().core.setUserEmail(\"\")\n-// Crashlytics.getInstance().core.setUserIdentifier(\"\")\n+ Crashlytics.getInstance().core.setUserName(\"\")\n+ Crashlytics.getInstance().core.setUserEmail(\"\")\n+ Crashlytics.getInstance().core.setUserIdentifier(\"\")\n} catch (e: Exception) {\n//ignored\n}\n@@ -31,7 +31,7 @@ class CrashlyticsRemoteLoggingStrategy : RemoteLoggingStrategy {\noverride fun logKeyValue(key: String?, value: String?) {\ntry {\n-// Crashlytics.getInstance().core.setString(key, value)\n+ Crashlytics.getInstance().core.setString(key, value)\n} catch (e: Exception) {\n//ignored\n}\n@@ -39,7 +39,7 @@ class CrashlyticsRemoteLoggingStrategy : RemoteLoggingStrategy {\noverride fun logError(e: Throwable?) {\ntry {\n-// Crashlytics.getInstance().core.logException(e)\n+ Crashlytics.getInstance().core.logException(e)\n} catch (err: Exception) {\n//ignored\n}\n@@ -47,7 +47,7 @@ class CrashlyticsRemoteLoggingStrategy : RemoteLoggingStrategy {\noverride fun logMessage(message: String?) {\ntry {\n-// Crashlytics.getInstance().core.log(message)\n+ Crashlytics.getInstance().core.log(message)\n} catch (e: Exception) {\n//ignored\n}\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | debug codes removed |
652,312 | 13.03.2019 17:26:30 | -10,800 | 4d9268c961ef37809f5bac13b793972e91b68f70 | FragmentCrossFeatureRoute created | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "core-ui/src/main/java/ru/surfstudio/android/core/ui/navigation/feature/route/feature/FragmentCrossFeatureRoute.kt",
"diff": "+/*\n+ Copyright (c) 2019-present, SurfStudio LLC, Maxim Tuev.\n+\n+ Licensed under the Apache License, Version 2.0 (the \"License\");\n+ you may not use this file except in compliance with the License.\n+ You may obtain a copy of the License at\n+\n+ http://www.apache.org/licenses/LICENSE-2.0\n+\n+ Unless required by applicable law or agreed to in writing, software\n+ distributed under the License is distributed on an \"AS IS\" BASIS,\n+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ See the License for the specific language governing permissions and\n+ limitations under the License.\n+ */\n+package ru.surfstudio.android.core.ui.navigation.feature.route.feature\n+\n+import androidx.fragment.app.Fragment\n+import ru.surfstudio.android.core.ui.navigation.fragment.route.FragmentRoute\n+import ru.surfstudio.android.logger.Logger\n+\n+/**\n+ * Cross-feature navigation Fragment route for different independent Gradle-projects.\n+ *\n+ * @see [FragmentRoute]\n+ * @see [CrossFeatureRoute]\n+ */\n+abstract class FragmentCrossFeatureRoute : CrossFeatureRoute, FragmentRoute() {\n+\n+ @Suppress(\"UNCHECKED_CAST\")\n+ override fun getFragmentClass(): Class<out Fragment>? {\n+ try {\n+ return Class.forName(targetClassPath()) as? Class<out Fragment> ?: return null\n+ } catch (e: ClassNotFoundException) {\n+ Logger.e(\"Fragment with the following classpath was not found in the current \" +\n+ \"application: ${targetClassPath()}. If this fragment is the part of Dynamic Feature, \" +\n+ \"please check if this Dynamic Feature is downloaded and installed on the device\" +\n+ \"successfully.\")\n+ }\n+ return null\n+ }\n+}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-455 FragmentCrossFeatureRoute created |
652,353 | 14.03.2019 11:45:30 | -10,800 | 638d35b6509743764bad44dd4397a29e2d2b2e59 | Add empty constructors for cross feature routes | [
{
"change_type": "MODIFY",
"old_path": "core-ui/src/main/java/ru/surfstudio/android/core/ui/navigation/feature/route/dynamic_feature/ActivityDynamicCrossFeatureWithParamsAndResultRoute.kt",
"new_path": "core-ui/src/main/java/ru/surfstudio/android/core/ui/navigation/feature/route/dynamic_feature/ActivityDynamicCrossFeatureWithParamsAndResultRoute.kt",
"diff": "@@ -37,8 +37,10 @@ import java.io.Serializable\nabstract class ActivityDynamicCrossFeatureWithParamsAndResultRoute<T : Serializable> :\nActivityCrossFeatureWithResultRoute<T> {\n- @Suppress(\"ConvertSecondaryConstructorToPrimary\", \"UNUSED_PARAMETER\")\n- constructor(intent: Intent) {\n+ constructor() {\n//empty\n}\n+\n+ @Suppress(\"ConvertSecondaryConstructorToPrimary\", \"UNUSED_PARAMETER\")\n+ constructor(intent: Intent) : this()\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "core-ui/src/main/java/ru/surfstudio/android/core/ui/navigation/feature/route/dynamic_feature/ActivityDynamicCrossFeatureWithParamsRoute.kt",
"new_path": "core-ui/src/main/java/ru/surfstudio/android/core/ui/navigation/feature/route/dynamic_feature/ActivityDynamicCrossFeatureWithParamsRoute.kt",
"diff": "@@ -32,8 +32,10 @@ import ru.surfstudio.android.core.ui.navigation.activity.route.ActivityRoute\n*/\nabstract class ActivityDynamicCrossFeatureWithParamsRoute : ActivityDynamicCrossFeatureRoute {\n- @Suppress(\"ConvertSecondaryConstructorToPrimary\", \"UNUSED_PARAMETER\")\n- constructor(intent: Intent) {\n+ constructor() {\n//empty\n}\n+\n+ @Suppress(\"ConvertSecondaryConstructorToPrimary\", \"UNUSED_PARAMETER\")\n+ constructor(intent: Intent) : this()\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "core-ui/src/main/java/ru/surfstudio/android/core/ui/navigation/feature/route/feature/ActivityCrossFeatureWithParamsAndResultRoute.kt",
"new_path": "core-ui/src/main/java/ru/surfstudio/android/core/ui/navigation/feature/route/feature/ActivityCrossFeatureWithParamsAndResultRoute.kt",
"diff": "@@ -35,8 +35,10 @@ import java.io.Serializable\nabstract class ActivityCrossFeatureWithParamsAndResultRoute<T : Serializable> :\nActivityCrossFeatureWithResultRoute<T> {\n- @Suppress(\"ConvertSecondaryConstructorToPrimary\", \"UNUSED_PARAMETER\")\n- constructor(intent: Intent) {\n+ constructor() {\n//empty\n}\n+\n+ @Suppress(\"ConvertSecondaryConstructorToPrimary\", \"UNUSED_PARAMETER\")\n+ constructor(intent: Intent) : this()\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "core-ui/src/main/java/ru/surfstudio/android/core/ui/navigation/feature/route/feature/ActivityCrossFeatureWithParamsRoute.kt",
"new_path": "core-ui/src/main/java/ru/surfstudio/android/core/ui/navigation/feature/route/feature/ActivityCrossFeatureWithParamsRoute.kt",
"diff": "@@ -31,8 +31,10 @@ import ru.surfstudio.android.core.ui.navigation.activity.route.ActivityRoute\n*/\nabstract class ActivityCrossFeatureWithParamsRoute : ActivityCrossFeatureRoute {\n- @Suppress(\"ConvertSecondaryConstructorToPrimary\", \"UNUSED_PARAMETER\")\n- constructor(intent: Intent) {\n+ constructor() {\n//empty\n}\n+\n+ @Suppress(\"ConvertSecondaryConstructorToPrimary\", \"UNUSED_PARAMETER\")\n+ constructor(intent: Intent) : this()\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Add empty constructors for cross feature routes |
652,312 | 14.03.2019 15:38:28 | -10,800 | c5b681cdea28cd8ca8d4387c18eef05affb7efbb | FragmentCrossFeatureWithParamsRoute created | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "core-ui/src/main/java/ru/surfstudio/android/core/ui/navigation/feature/route/feature/FragmentCrossFeatureWithParamsRoute.kt",
"diff": "+/*\n+ Copyright (c) 2019-present, SurfStudio LLC, Maxim Tuev.\n+\n+ Licensed under the Apache License, Version 2.0 (the \"License\");\n+ you may not use this file except in compliance with the License.\n+ You may obtain a copy of the License at\n+\n+ http://www.apache.org/licenses/LICENSE-2.0\n+\n+ Unless required by applicable law or agreed to in writing, software\n+ distributed under the License is distributed on an \"AS IS\" BASIS,\n+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ See the License for the specific language governing permissions and\n+ limitations under the License.\n+ */\n+package ru.surfstudio.android.core.ui.navigation.feature.route.feature\n+\n+import android.os.Bundle\n+import androidx.fragment.app.Fragment\n+import ru.surfstudio.android.core.ui.navigation.FragmentRouteInterface\n+\n+/**\n+ * Cross-feature navigation Fragment route with parameters for different independent Gradle-projects.\n+ *\n+ * @see [FragmentCrossFeatureRoute]\n+ * @see [FragmentRouteInterface]\n+ */\n+abstract class FragmentCrossFeatureWithParamsRoute : FragmentCrossFeatureRoute, FragmentRouteInterface {\n+\n+ constructor() {\n+ //empty\n+ }\n+\n+ @Suppress(\"ConvertSecondaryConstructorToPrimary\", \"UNUSED_PARAMETER\")\n+ constructor(bundle: Bundle) : this()\n+\n+ override fun createFragment(): Fragment {\n+ return super.createFragment().apply {\n+ arguments = prepareBundle()\n+ }\n+ }\n+}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-455 FragmentCrossFeatureWithParamsRoute created |
652,355 | 18.03.2019 12:55:42 | -10,800 | af2efd9afb247cbd268a12276860382b4e394231 | Override getPresenters for BaseRxFragmentView and BaseRxDialogView | [
{
"change_type": "MODIFY",
"old_path": "core-mvp-binding/src/main/java/ru/surfstudio/android/core/mvp/binding/rx/ui/BaseRxViews.kt",
"new_path": "core-mvp-binding/src/main/java/ru/surfstudio/android/core/mvp/binding/rx/ui/BaseRxViews.kt",
"diff": "@@ -59,6 +59,8 @@ abstract class BaseRxFragmentView : CoreFragmentView(), BindableRxView {\nprivate val viewDisposable = CompositeDisposable()\n+ override fun getPresenters() = emptyArray<BaseRxPresenter>()\n+\n@CallSuper\noverride fun onDestroy() {\nviewDisposable.clear()\n@@ -75,6 +77,8 @@ abstract class BaseRxDialogView : CoreDialogFragmentView(), BindableRxView {\nprivate val viewDisposable = CompositeDisposable()\n+ override fun getPresenters() = emptyArray<BaseRxPresenter>()\n+\n@CallSuper\noverride fun onDestroy() {\nviewDisposable.clear()\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Override getPresenters for BaseRxFragmentView and BaseRxDialogView |
652,337 | 22.03.2019 17:49:17 | -18,000 | 563b2152f5f59de554b248a42e820d7e41fe8e88 | added test methods for Completable and Single | [
{
"change_type": "MODIFY",
"old_path": "template/small-test-utils/src/main/java/ru/surfstudio/standard/small_test_utils/BaseNetworkDaggerTest.kt",
"new_path": "template/small-test-utils/src/main/java/ru/surfstudio/standard/small_test_utils/BaseNetworkDaggerTest.kt",
"diff": "@@ -2,7 +2,9 @@ package ru.surfstudio.standard.small_test_utils\nimport android.security.NetworkSecurityPolicy\nimport androidx.annotation.CallSuper\n+import io.reactivex.Completable\nimport io.reactivex.Observable\n+import io.reactivex.Single\nimport io.reactivex.observers.TestObserver\nimport org.junit.After\nimport org.junit.Before\n@@ -48,6 +50,14 @@ abstract class BaseNetworkDaggerTest<T> {\nreturn observable.test().assertNoErrors()\n}\n+ protected fun <T> test(single: Single<T>): TestObserver<T> {\n+ return single.test().assertNoErrors()\n+ }\n+\n+ protected fun test(completable: Completable): TestObserver<T> {\n+ return test(completable.toObservable())\n+ }\n+\nprotected fun <T> testAndGetValues(observable: Observable<T>): List<T> {\nreturn test(observable).values()\n}\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-457 added test methods for Completable and Single |
652,305 | 17.04.2019 18:11:43 | -10,800 | a636b33eb0f313196317964006988b13908c6dc3 | add bindings to file templates. | [
{
"change_type": "MODIFY",
"old_path": "templates/file/surf/BindingScreen/root/src/app_package/kotlin/ScreenConfigurator.kt.ftl",
"new_path": "templates/file/surf/BindingScreen/root/src/app_package/kotlin/ScreenConfigurator.kt.ftl",
"diff": "@@ -9,7 +9,7 @@ import android.os.Bundle\nimport dagger.Component\nimport dagger.Module\nimport dagger.Provides\n-import ru.surfstudio.android.core.mvp.configurator.ScreenComponent\n+import ru.surfstudio.android.core.mvp.configurator.BindableScreenComponent\nimport ru.surfstudio.android.dagger.scope.PerScreen\n@@ -22,7 +22,7 @@ class ${configuratorClassName}(<#if screenType=='activity'>intent: Intent<#else>\nparentComponent: ActivityComponent,\n${dependingScreenModuleVariableName}: ${dependingScreenModuleClassName},\n<#if screenType=='activity'>intent: Intent<#else>args: Bundle</#if>\n- ) = Dagger${configuratorClassName}_${screenComponentClassName}\n+ ): ${screenComponentClassName} = Dagger${configuratorClassName}_${screenComponentClassName}\n.builder()\n.activityComponent(parentComponent)\n.${dependingScreenModuleVariableName}(${dependingScreenModuleVariableName})\n@@ -34,15 +34,11 @@ class ${configuratorClassName}(<#if screenType=='activity'>intent: Intent<#else>\ndependencies = [ActivityComponent::class],\nmodules = [${dependingScreenModuleClassName}::class, ${screenModuleClassName}::class]\n)\n- interface ${screenComponentClassName} : ScreenComponent<${viewClassName}>\n+ interface ${screenComponentClassName} : BindableScreenComponent<${viewClassName}>\n@Module\ninternal class ${screenModuleClassName} <#if needToGenerateParams>(route: ${routeClassName}): CustomScreenModule<${routeClassName}>(route)</#if>{\n- @Provides\n- @PerScreen\n- fun provideBindModel(<#if needToGenerateParams>route: ${routeClassName}</#if>): ${bindModelClassName} = ${bindModelClassName}()\n-\n@Provides\n@PerScreen\nfun providePresenter(presenter: ${presenterClassName}) = Any()\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/file/surf/BindingScreen/root/src/app_package/kotlin/View.kt.ftl",
"new_path": "templates/file/surf/BindingScreen/root/src/app_package/kotlin/View.kt.ftl",
"diff": "@@ -19,9 +19,6 @@ import android.view.ViewGroup\n*/\nclass ${viewClassName} : ${viewParentClassName}() {\n- @Inject\n- lateinit var presenter: ${presenterClassName}\n-\n@Inject\nlateinit var bm: ${bindModelClassName}\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-456 add bindings to file templates. |
652,305 | 18.04.2019 16:32:28 | -10,800 | f4c842ab3a50e6109d858436035433b273b00567 | add possibility to create feature and interactor modules. | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "templates/file/surf/FeatureModule/globals.xml.ftl",
"diff": "+<?xml version=\"1.0\"?>\n+<globals>\n+ <global id=\"moduleName\" value=\"f_${escapeXmlAttribute(featureModuleNameWithoutPrefix)}\"/>\n+</globals>\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "templates/file/surf/FeatureModule/recipe.xml.ftl",
"diff": "+<?xml version=\"1.0\"?>\n+<recipe>\n+ <mkdir at=\"${moduleName}\" />\n+ <mkdir at=\"${moduleName}/src/main/java/${slashedPackageName(packageName)}/${moduleName}\" />\n+ <mkdir at=\"${moduleName}/src/main/res\" />\n+ <merge from=\"settings.gradle.ftl\" to=\"settings.gradle\" />\n+ <instantiate from=\"build.gradle.ftl\" to=\"${moduleName}/build.gradle\" />\n+ <instantiate from=\"AndroidManifest.xml.ftl\" to=\"${moduleName}/src/main/AndroidManifest.xml\" />\n+ <copy from=\"root://gradle-projects/common/gitignore\" to=\"${moduleName}/.gitignore\" />\n+\n+</recipe>\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "templates/file/surf/FeatureModule/root/AndroidManifest.xml.ftl",
"diff": "+<manifest xmlns:android=\"http://schemas.android.com/apk/res/android\"\n+ package=\"${packageName}.${moduleName}\">\n+\n+ <application>\n+\n+ </application>\n+\n+</manifest>\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "templates/file/surf/FeatureModule/root/build.gradle.ftl",
"diff": "+apply from: '../commonFeatureModule.gradle'\n+apply from: '../commonKaptModule.gradle'\n+\n+dependencies {\n+\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "templates/file/surf/FeatureModule/root/settings.gradle.ftl",
"diff": "+include ':${moduleName}'\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "templates/file/surf/InteractorModule/globals.xml.ftl",
"diff": "+<?xml version=\"1.0\"?>\n+<globals>\n+ <global id=\"moduleName\" value=\"i_${escapeXmlAttribute(interactorModuleNameWithoutPrefix)}\"/>\n+</globals>\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "templates/file/surf/InteractorModule/recipe.xml.ftl",
"diff": "+<?xml version=\"1.0\"?>\n+<recipe>\n+ <mkdir at=\"${moduleName}\" />\n+ <mkdir at=\"${moduleName}/src/main/java/${slashedPackageName(packageName)}/${moduleName}\" />\n+ <merge from=\"settings.gradle.ftl\" to=\"settings.gradle\" />\n+ <instantiate from=\"build.gradle.ftl\" to=\"${moduleName}/build.gradle\" />\n+ <instantiate from=\"AndroidManifest.xml.ftl\" to=\"${moduleName}/src/main/AndroidManifest.xml\" />\n+ <copy from=\"root://gradle-projects/common/gitignore\" to=\"${moduleName}/.gitignore\" />\n+\n+</recipe>\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "templates/file/surf/InteractorModule/root/AndroidManifest.xml.ftl",
"diff": "+<manifest package=\"${packageName}.${moduleName}\" />\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "templates/file/surf/InteractorModule/root/build.gradle.ftl",
"diff": "+apply from: '../commonInteractorModule.gradle'\n+apply from: '../unitTestConfiguration.gradle'\n+\n+dependencies {\n+\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "templates/file/surf/InteractorModule/root/settings.gradle.ftl",
"diff": "+include ':${moduleName}'\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-456 add possibility to create feature and interactor modules. |
652,337 | 19.04.2019 15:20:17 | -18,000 | 1cd6145cb2b956e81705313e934242dcc9f143a9 | added bottomsheet view | [
{
"change_type": "ADD",
"old_path": "custom-view/src/main/res/drawable-hdpi/bg_light_rounded_top_w_shadow.9.png",
"new_path": "custom-view/src/main/res/drawable-hdpi/bg_light_rounded_top_w_shadow.9.png",
"diff": "Binary files /dev/null and b/custom-view/src/main/res/drawable-hdpi/bg_light_rounded_top_w_shadow.9.png differ\n"
},
{
"change_type": "ADD",
"old_path": "custom-view/src/main/res/drawable-mdpi/bg_light_rounded_top_w_shadow.9.png",
"new_path": "custom-view/src/main/res/drawable-mdpi/bg_light_rounded_top_w_shadow.9.png",
"diff": "Binary files /dev/null and b/custom-view/src/main/res/drawable-mdpi/bg_light_rounded_top_w_shadow.9.png differ\n"
},
{
"change_type": "ADD",
"old_path": "custom-view/src/main/res/drawable-xhdpi/bg_light_rounded_top_w_shadow.9.png",
"new_path": "custom-view/src/main/res/drawable-xhdpi/bg_light_rounded_top_w_shadow.9.png",
"diff": "Binary files /dev/null and b/custom-view/src/main/res/drawable-xhdpi/bg_light_rounded_top_w_shadow.9.png differ\n"
},
{
"change_type": "ADD",
"old_path": "custom-view/src/main/res/drawable-xxhdpi/bg_light_rounded_top_w_shadow.9.png",
"new_path": "custom-view/src/main/res/drawable-xxhdpi/bg_light_rounded_top_w_shadow.9.png",
"diff": "Binary files /dev/null and b/custom-view/src/main/res/drawable-xxhdpi/bg_light_rounded_top_w_shadow.9.png differ\n"
},
{
"change_type": "ADD",
"old_path": "custom-view/src/main/res/drawable-xxxhdpi/bg_light_rounded_top_w_shadow.9.png",
"new_path": "custom-view/src/main/res/drawable-xxxhdpi/bg_light_rounded_top_w_shadow.9.png",
"diff": "Binary files /dev/null and b/custom-view/src/main/res/drawable-xxxhdpi/bg_light_rounded_top_w_shadow.9.png differ\n"
},
{
"change_type": "MODIFY",
"old_path": "template/app/build.gradle",
"new_path": "template/app/build.gradle",
"diff": "@@ -46,6 +46,7 @@ dependencies {\nimplementation \"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion\"\nimplementation \"androidx.appcompat:appcompat:$androidxVersion\"\n+ implementation \"androidx.legacy:legacy-support-v4:$androidxLegacySupportVersion\"\nimplementation \"com.google.dagger:dagger:$daggerVersion\"\nkapt \"com.google.dagger:dagger-compiler:$daggerVersion\"\n"
},
{
"change_type": "MODIFY",
"old_path": "template/config.gradle",
"new_path": "template/config.gradle",
"diff": "@@ -33,6 +33,7 @@ ext {\nandroidxMaterialVersion = '1.0.0' //http://bit.ly/2KAAq1y\nandroidxRecyclerViewVersion = '1.0.0' //http://bit.ly/2RcUQjD\nandroidxExitInterfaceVersion = '1.0.0' //http://bit.ly/2DPqlw6\n+ androidxLegacySupportVersion = '1.0.0'\nandroidxKtxVersion = '1.0.1' //http://bit.ly/2qY7ffW\nandroidxTestVersion = '1.0.0' //http://bit.ly/2P1yKi1\nandroidxTestExtJunitVersion = '1.0.0' //http://bit.ly/2zC6UV1\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-471 added bottomsheet view |
652,337 | 19.04.2019 16:26:50 | -18,000 | 43849583b546abe959a39791ea86c4be2da99175 | updated example of use | [
{
"change_type": "MODIFY",
"old_path": "custom-view-sample/src/main/AndroidManifest.xml",
"new_path": "custom-view-sample/src/main/AndroidManifest.xml",
"diff": "android:label=\"@string/app_name\"\nandroid:roundIcon=\"@mipmap/ic_launcher_round\"\nandroid:supportsRtl=\"true\"\n- android:theme=\"@style/AppTheme\">\n+ android:theme=\"@style/CustomViewTheme\">\n<activity android:name=\".MainActivity\">\n<intent-filter>\n<action android:name=\"android.intent.action.MAIN\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "custom-view-sample/src/main/java/ru/surfstudio/android/custom_view_sample/MainActivity.kt",
"new_path": "custom-view-sample/src/main/java/ru/surfstudio/android/custom_view_sample/MainActivity.kt",
"diff": "@@ -4,6 +4,8 @@ import android.content.Intent\nimport android.os.Bundle\nimport androidx.appcompat.app.AppCompatActivity\nimport kotlinx.android.synthetic.main.activity_main.*\n+import ru.surfstudio.android.animations.anim.fadeIn\n+import ru.surfstudio.android.animations.anim.fadeOut\nimport ru.surfstudio.android.sample.common.ui.base.loadstate.LoadState\nimport ru.surfstudio.android.sample.common.ui.base.loadstate.renderer.DefaultLoadStateRenderer\n@@ -14,6 +16,9 @@ class MainActivity : AppCompatActivity() {\noverride fun onCreate(savedInstanceState: Bundle?) {\nsuper.onCreate(savedInstanceState)\nsetContentView(R.layout.activity_main)\n+\n+ setSupportActionBar(toolbar)\n+\nloadStateRenderer = DefaultLoadStateRenderer(placeholder_view)\nloadStateRenderer.render(LoadState.MAIN_LOADING)\nvar x = 0\n@@ -30,5 +35,20 @@ class MainActivity : AppCompatActivity() {\nopen_tv_screen_btn.setOnClickListener {\nstartActivity(Intent(this, TitleSubtitleViewDemoActivity::class.java))\n}\n+ root_container.addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ ->\n+ updateBSPeekHeight()\n+ }\n+ with(example_bsv) {\n+ onExpandListener = {\n+ top_title_tsv.fadeIn()\n+ }\n+ onCollapseListener = {\n+ top_title_tsv.fadeOut()\n+ }\n+ }\n+ }\n+\n+ private fun updateBSPeekHeight() {\n+ example_bsv.setPeekHeight(root_container.height - toolbar.height - content_container.height)\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "custom-view-sample/src/main/res/layout/activity_main.xml",
"new_path": "custom-view-sample/src/main/res/layout/activity_main.xml",
"diff": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n-<LinearLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\n+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\n+ xmlns:app=\"http://schemas.android.com/apk/res-auto\"\nxmlns:tools=\"http://schemas.android.com/tools\"\n+ android:id=\"@+id/root_container\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"match_parent\"\n- android:orientation=\"vertical\"\ntools:context=\"ru.surfstudio.android.custom_view_sample.MainActivity\">\n+ <LinearLayout\n+ android:id=\"@+id/content_container\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"wrap_content\"\n+ android:layout_marginTop=\"?actionBarSize\"\n+ android:orientation=\"vertical\">\n+\n<Button\nandroid:id=\"@+id/open_tv_screen_btn\"\nandroid:layout_width=\"match_parent\"\n<ru.surfstudio.android.custom.view.placeholder.PlaceHolderViewContainer\nandroid:id=\"@+id/placeholder_view\"\n- android:layout_width=\"0dp\"\n- android:layout_height=\"0dp\" />\n-\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"300dp\" />\n</LinearLayout>\n+\n+ <ru.surfstudio.android.custom.view.bottomsheet.BottomSheetView\n+ android:id=\"@+id/example_bsv\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"match_parent\"\n+ app:behavior_hideable=\"false\"\n+ app:layout_behavior=\"com.google.android.material.bottomsheet.BottomSheetBehavior\">\n+\n+ <TextView\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"wrap_content\"\n+ android:layout_marginTop=\"94dp\"\n+ android:gravity=\"center\"\n+ android:text=\"Bottom Sheet View\"\n+ tools:ignore=\"HardcodedText\" />\n+\n+ </ru.surfstudio.android.custom.view.bottomsheet.BottomSheetView>\n+\n+ <androidx.appcompat.widget.Toolbar\n+ android:id=\"@+id/toolbar\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"?actionBarSize\"\n+ android:background=\"@color/colorPrimaryDark\">\n+\n+ <ru.surfstudio.android.custom.view.TitleSubtitleView\n+ android:id=\"@+id/top_title_tsv\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"wrap_content\"\n+ app:subTitleText=\"Example text\"\n+ app:subtitleTextAppearance=\"@style/Text.Light.12\"\n+ app:titleText=\"@string/app_name\"\n+ app:titleTextAppearance=\"@style/Text.Light\" />\n+ </androidx.appcompat.widget.Toolbar>\n+\n+</androidx.coordinatorlayout.widget.CoordinatorLayout>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "template/app/build.gradle",
"new_path": "template/app/build.gradle",
"diff": "@@ -46,7 +46,6 @@ dependencies {\nimplementation \"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion\"\nimplementation \"androidx.appcompat:appcompat:$androidxVersion\"\n- implementation \"androidx.legacy:legacy-support-v4:$androidxLegacySupportVersion\"\nimplementation \"com.google.dagger:dagger:$daggerVersion\"\nkapt \"com.google.dagger:dagger-compiler:$daggerVersion\"\n"
},
{
"change_type": "MODIFY",
"old_path": "template/config.gradle",
"new_path": "template/config.gradle",
"diff": "@@ -33,7 +33,6 @@ ext {\nandroidxMaterialVersion = '1.0.0' //http://bit.ly/2KAAq1y\nandroidxRecyclerViewVersion = '1.0.0' //http://bit.ly/2RcUQjD\nandroidxExitInterfaceVersion = '1.0.0' //http://bit.ly/2DPqlw6\n- androidxLegacySupportVersion = '1.0.0'\nandroidxKtxVersion = '1.0.1' //http://bit.ly/2qY7ffW\nandroidxTestVersion = '1.0.0' //http://bit.ly/2P1yKi1\nandroidxTestExtJunitVersion = '1.0.0' //http://bit.ly/2zC6UV1\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-471 updated example of use |
652,303 | 26.03.2019 12:13:30 | -10,800 | 295ea7393ec58a542c028ea552e40ce5945bf434 | add licences to classes | [
{
"change_type": "MODIFY",
"old_path": "core-mvp-binding/src/main/java/ru/surfstudio/android/core/mvp/binding/rx/ui/BaseRxWidgetsView.kt",
"new_path": "core-mvp-binding/src/main/java/ru/surfstudio/android/core/mvp/binding/rx/ui/BaseRxWidgetsView.kt",
"diff": "+/*\n+ * Copyright (c) 2019-present, SurfStudio LLC.\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+\npackage ru.surfstudio.android.core.mvp.binding.rx.ui\nimport android.content.Context\n"
},
{
"change_type": "MODIFY",
"old_path": "mvp-widget/src/main/java/ru/surfstudio/android/mvp/widget/delegate/ViewContextUnwrapper.kt",
"new_path": "mvp-widget/src/main/java/ru/surfstudio/android/mvp/widget/delegate/ViewContextUnwrapper.kt",
"diff": "+/*\n+ * Copyright (c) 2019-present, SurfStudio LLC.\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+\npackage ru.surfstudio.android.mvp.widget.delegate\nimport android.content.Context\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-458 add licences to classes |
652,303 | 22.04.2019 11:08:37 | -10,800 | 90a157ada38f88ad28a33f3db3b367e363e6e3b8 | remove reified generics | [
{
"change_type": "MODIFY",
"old_path": "mvp-widget/src/main/java/ru/surfstudio/android/mvp/widget/configurator/BaseWidgetViewConfigurator.java",
"new_path": "mvp-widget/src/main/java/ru/surfstudio/android/mvp/widget/configurator/BaseWidgetViewConfigurator.java",
"diff": "@@ -42,9 +42,8 @@ public abstract class BaseWidgetViewConfigurator<P, M> implements ViewConfigurat\nprotected abstract ScreenComponent createScreenComponent(P parentComponent,\nM widgetScreenModule);\n-\n- protected View getTargetWidgetView() {\n- return (View) getPersistentScope().getScreenState().getCoreWidget();\n+ protected <T extends View & CoreWidgetViewInterface> T getTargetWidgetView() {\n+ return (T) getPersistentScope().getScreenState().getWidget();\n}\nprotected WidgetViewPersistentScope getPersistentScope() {\n"
},
{
"change_type": "MODIFY",
"old_path": "mvp-widget/src/main/java/ru/surfstudio/android/mvp/widget/delegate/ParentPersistentScopeFinder.kt",
"new_path": "mvp-widget/src/main/java/ru/surfstudio/android/mvp/widget/delegate/ParentPersistentScopeFinder.kt",
"diff": "@@ -30,7 +30,7 @@ class ParentPersistentScopeFinder(private val child: View) {\nfun find(): ScreenPersistentScope? {\nvar parentScope: ScreenPersistentScope? = null\n- val activity = unwrapContext<FragmentActivity>(child.context)\n+ val activity = unwrapContext(child.context, FragmentActivity::class.java)\nval fragments = activity.supportFragmentManager.fragments\nvar parent: ViewParent? = child.parent\n"
},
{
"change_type": "MODIFY",
"old_path": "mvp-widget/src/main/java/ru/surfstudio/android/mvp/widget/delegate/ViewContextUnwrapper.kt",
"new_path": "mvp-widget/src/main/java/ru/surfstudio/android/mvp/widget/delegate/ViewContextUnwrapper.kt",
"diff": "@@ -24,10 +24,10 @@ import android.view.ContextThemeWrapper\n* Helps to avoid problems with ContextThemeWrapper\n* @see <a href=\"https://clck.ru/FRZrW\">ContextThemeWrapper problem</a>\n*/\n-inline fun <reified T> unwrapContext(context: Context): T {\n+fun <T> unwrapContext(context: Context, clazz: Class<T>): T {\nvar unwrappedContext = context\n- while (unwrappedContext !is T && unwrappedContext is ContextThemeWrapper) {\n+ while (!clazz.isInstance(unwrappedContext) && unwrappedContext is ContextThemeWrapper) {\nunwrappedContext = unwrappedContext.baseContext\n}\n- return unwrappedContext as T\n+ return clazz.cast(unwrappedContext)!!\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "sample-dagger/src/main/java/ru/surfstudio/android/sample/dagger/ui/base/configurator/DefaultWidgetScreenConfigurator.java",
"new_path": "sample-dagger/src/main/java/ru/surfstudio/android/sample/dagger/ui/base/configurator/DefaultWidgetScreenConfigurator.java",
"diff": "@@ -2,6 +2,7 @@ package ru.surfstudio.android.sample.dagger.ui.base.configurator;\nimport ru.surfstudio.android.core.ui.activity.CoreActivityInterface;\nimport ru.surfstudio.android.mvp.widget.configurator.BaseWidgetViewConfigurator;\n+import ru.surfstudio.android.mvp.widget.delegate.ViewContextUnwrapperKt;\nimport ru.surfstudio.android.sample.dagger.ui.base.dagger.activity.DefaultActivityComponent;\nimport ru.surfstudio.android.sample.dagger.ui.base.dagger.widget.DefaultWidgetScreenModule;\n@@ -19,7 +20,11 @@ public abstract class DefaultWidgetScreenConfigurator\n@Override\nprotected DefaultActivityComponent getParentComponent() {\n- return (DefaultActivityComponent) ((CoreActivityInterface) getTargetWidgetView().getContext())\n+ return (DefaultActivityComponent) (\n+ ViewContextUnwrapperKt.unwrapContext(\n+ getTargetWidgetView().getContext(), CoreActivityInterface.class\n+ )\n+ )\n.getPersistentScope()\n.getConfigurator()\n.getActivityComponent();\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-458 remove reified generics |
652,337 | 22.04.2019 15:34:26 | -18,000 | 33862cdc6347823fe8ea390fd3c44363b5708cc1 | added auto tests | [
{
"change_type": "MODIFY",
"old_path": "custom-view-sample/src/androidTest/java/ru/surfstudio/android/custom_view_sample/CustomViewSampleTest.kt",
"new_path": "custom-view-sample/src/androidTest/java/ru/surfstudio/android/custom_view_sample/CustomViewSampleTest.kt",
"diff": "package ru.surfstudio.android.custom_view_sample\n+import android.view.View\nimport androidx.test.espresso.Espresso\n+import androidx.test.espresso.UiController\n+import androidx.test.espresso.ViewAction\n+import androidx.test.espresso.assertion.ViewAssertions.matches\n+import androidx.test.espresso.matcher.ViewMatchers\n+import androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom\n+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed\n+import org.hamcrest.Matcher\nimport org.junit.Test\n+import ru.surfstudio.android.custom.view.bottomsheet.BottomSheetView\nimport ru.surfstudio.android.sample.common.test.base.BaseSampleTest\nimport ru.surfstudio.android.sample.common.test.utils.ActivityUtils.checkIfActivityIsVisible\nimport ru.surfstudio.android.sample.common.test.utils.AnimationUtils\n@@ -29,5 +38,20 @@ class CustomViewSampleTest : BaseSampleTest<MainActivity>(MainActivity::class.ja\nEspresso.pressBack()\nperformClick(R.id.change_state_btn)\n+\n+ Espresso.onView(ViewMatchers.withId(R.id.example_bsv)).perform(object : ViewAction {\n+\n+ override fun getDescription() = \"Swipe up of bottomsheet view\"\n+\n+ override fun getConstraints(): Matcher<View> {\n+ return isAssignableFrom(BottomSheetView::class.java)\n+ }\n+\n+ override fun perform(uiController: UiController?, view: View?) {\n+ val bsView = view as BottomSheetView\n+ bsView.expand()\n+ }\n+ })\n+ Espresso.onView(ViewMatchers.withId(R.id.top_title_tsv)).check(matches(isDisplayed()))\n}\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-471 added auto tests |
652,337 | 22.05.2019 18:09:47 | -18,000 | a96ed06fc6b9c0c0e3e356d1f67cd507ce06924e | fixed widget error when view recreating | [
{
"change_type": "MODIFY",
"old_path": "core-ui/build.gradle",
"new_path": "core-ui/build.gradle",
"diff": "apply from: '../androidModule.gradle'\ndependencies {\n+ implementation \"io.reactivex.rxjava2:rxjava:$rxJava2Version\"\napi \"com.google.android.material:material:$androidxMaterialVersion\"\nimplementation \"androidx.appcompat:appcompat:$androidxVersion\"\nimplementation \"com.google.android.play:core:$playCoreVersion\" //for split install features support\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | fixed widget error when view recreating |
652,323 | 22.05.2019 18:04:31 | -10,800 | ef8069265b9f81a7cd2a86306f47badf3ab1f89a | add component json | [
{
"change_type": "MODIFY",
"old_path": "analytics/build.gradle",
"new_path": "analytics/build.gradle",
"diff": "@@ -5,4 +5,6 @@ dependencies {\nimplementation \"com.annimon:stream:$annimonStreamVersion\"\n}\n-gradle.ext.configAndroidStandardDependencies this\n\\ No newline at end of file\n+gradle.ext.configAndroidStandardDependencies (this, [\n+ 'logger', //todo temp\n+])\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": "buildSrc/build.gradle",
"new_path": "buildSrc/build.gradle",
"diff": ""
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "buildSrc/src/main/groovy/ru/surfstudio/android/build/Util.groovy",
"diff": "+package ru.surfstudio.android.build\n+\n+class Util {\n+\n+ private static String value = \"\"\n+ static String util() {\n+ return value\n+ }\n+\n+ static init(String val){\n+ value = val\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "firebase-analytics/build.gradle",
"new_path": "firebase-analytics/build.gradle",
"diff": "@@ -5,5 +5,6 @@ dependencies {\n}\ngradle.ext.configAndroidStandardDependencies(this, [\n- 'analytics'\n+ 'analytics',\n+ 'rx-extension' //todo temp\n])\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "gradle/wrapper/gradle-wrapper.properties",
"new_path": "gradle/wrapper/gradle-wrapper.properties",
"diff": "-#Tue Sep 25 15:46:05 MSK 2018\n+#Fri Apr 26 17:18:44 MSK 2019\ndistributionBase=GRADLE_USER_HOME\ndistributionPath=wrapper/dists\nzipStoreBase=GRADLE_USER_HOME\nzipStorePath=wrapper/dists\n-distributionUrl=https\\://services.gradle.org/distributions/gradle-4.6-all.zip\n\\ No newline at end of file\n+distributionUrl=https\\://services.gradle.org/distributions/gradle-5.1.1-all.zip\n"
},
{
"change_type": "MODIFY",
"old_path": "modules.json",
"new_path": "modules.json",
"diff": "[\n- {\n- \"name\": \"core-app\",\n- \"version\": \"\",\n- \"path\": \"\"\n- },\n- {\n- \"name\": \"core-ui\",\n- \"version\": \"\",\n- \"path\": \"\"\n- },\n- {\n- \"name\": \"core-mvp\",\n- \"version\": \"\",\n- \"path\": \"\"\n- },\n- {\n- \"name\": \"core-mvp-binding\",\n- \"version\": \"\",\n- \"path\": \"\"\n- },\n{\n\"name\": \"analytics\",\n\"version\": \"\",\n\"path\": \"\"\n},\n- {\n- \"name\": \"network\",\n- \"version\": \"\",\n- \"path\": \"\"\n- },\n- {\n- \"name\": \"filestorage\",\n- \"version\": \"\",\n- \"path\": \"\"\n- },\n- {\n- \"name\": \"push\",\n- \"version\": \"\",\n- \"path\": \"\"\n- },\n- {\n- \"name\": \"dagger-scope\",\n- \"version\": \"\",\n- \"path\": \"\"\n- },\n{\n\"name\": \"logger\",\n\"version\": \"\",\n\"path\": \"\"\n},\n- {\n- \"name\": \"converter-gson\",\n- \"version\": \"\",\n- \"path\": \"\"\n- },\n- {\n- \"name\": \"easyadapter\",\n- \"version\": \"\",\n- \"path\": \"\"\n- },\n- {\n- \"name\": \"recycler-extension\",\n- \"version\": \"\",\n- \"path\": \"\"\n- },\n- {\n- \"name\": \"datalist-limit-offset\",\n- \"version\": \"\",\n- \"path\": \"\"\n- },\n- {\n- \"name\": \"datalist-page-count\",\n- \"version\": \"\",\n- \"path\": \"\"\n- },\n{\n\"name\": \"firebase-analytics\",\n\"version\": \"\",\n\"name\": \"rx-extension\",\n\"version\": \"\",\n\"path\": \"\"\n- },\n- {\n- \"name\": \"connection\",\n- \"version\": \"\",\n- \"path\": \"\"\n- },\n- {\n- \"name\": \"standard-dialog\",\n- \"version\": \"\",\n- \"path\": \"\"\n- },\n- {\n- \"name\": \"util-ktx\",\n- \"version\": \"\",\n- \"path\": \"\"\n- },\n- {\n- \"name\": \"app-migration\",\n- \"version\": \"\",\n- \"path\": \"\"\n- },\n- {\n- \"name\": \"shared-pref\",\n- \"version\": \"\",\n- \"path\": \"\"\n- },\n- {\n- \"name\": \"custom-view\",\n- \"version\": \"\",\n- \"path\": \"\"\n- },\n- {\n- \"name\": \"mvp-dialog\",\n- \"version\": \"\",\n- \"path\": \"\"\n- },\n- {\n- \"name\": \"mvp-widget\",\n- \"version\": \"\",\n- \"path\": \"\"\n- },\n- {\n- \"name\": \"picture-provider\",\n- \"version\": \"\",\n- \"path\": \"\"\n- },\n- {\n- \"name\": \"imageloader\",\n- \"version\": \"\",\n- \"path\": \"\"\n- },\n- {\n- \"name\": \"animations\",\n- \"version\": \"\",\n- \"path\": \"\"\n- },\n- {\n- \"name\": \"broadcast-extension\",\n- \"version\": \"\",\n- \"path\": \"\"\n- },\n- {\n- \"name\": \"message-controller\",\n- \"version\": \"\",\n- \"path\": \"\"\n- },\n- {\n- \"name\": \"location\",\n- \"version\": \"\",\n- \"path\": \"\"\n- },\n- {\n- \"name\": \"rxbus\",\n- \"version\": \"\",\n- \"path\": \"\"\n- },\n- {\n- \"name\": \"activity-holder\",\n- \"path\": \"\"\n}\n]\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "modules.json.copy",
"diff": "+[\n+ {\n+ \"name\": \"core-app\",\n+ \"version\": \"\",\n+ \"path\": \"\"\n+ },\n+ {\n+ \"name\": \"core-ui\",\n+ \"version\": \"\",\n+ \"path\": \"\"\n+ },\n+ {\n+ \"name\": \"core-mvp\",\n+ \"version\": \"\",\n+ \"path\": \"\"\n+ },\n+ {\n+ \"name\": \"core-mvp-binding\",\n+ \"version\": \"\",\n+ \"path\": \"\"\n+ },\n+ {\n+ \"name\": \"analytics\",\n+ \"version\": \"\",\n+ \"path\": \"\"\n+ },\n+ {\n+ \"name\": \"network\",\n+ \"version\": \"\",\n+ \"path\": \"\"\n+ },\n+ {\n+ \"name\": \"filestorage\",\n+ \"version\": \"\",\n+ \"path\": \"\"\n+ },\n+ {\n+ \"name\": \"push\",\n+ \"version\": \"\",\n+ \"path\": \"\"\n+ },\n+ {\n+ \"name\": \"dagger-scope\",\n+ \"version\": \"\",\n+ \"path\": \"\"\n+ },\n+ {\n+ \"name\": \"logger\",\n+ \"version\": \"\",\n+ \"path\": \"\"\n+ },\n+ {\n+ \"name\": \"converter-gson\",\n+ \"version\": \"\",\n+ \"path\": \"\"\n+ },\n+ {\n+ \"name\": \"easyadapter\",\n+ \"version\": \"\",\n+ \"path\": \"\"\n+ },\n+ {\n+ \"name\": \"recycler-extension\",\n+ \"version\": \"\",\n+ \"path\": \"\"\n+ },\n+ {\n+ \"name\": \"datalist-limit-offset\",\n+ \"version\": \"\",\n+ \"path\": \"\"\n+ },\n+ {\n+ \"name\": \"datalist-page-count\",\n+ \"version\": \"\",\n+ \"path\": \"\"\n+ },\n+ {\n+ \"name\": \"firebase-analytics\",\n+ \"version\": \"\",\n+ \"path\": \"\"\n+ },\n+ {\n+ \"name\": \"rx-extension\",\n+ \"version\": \"\",\n+ \"path\": \"\"\n+ },\n+ {\n+ \"name\": \"connection\",\n+ \"version\": \"\",\n+ \"path\": \"\"\n+ },\n+ {\n+ \"name\": \"standard-dialog\",\n+ \"version\": \"\",\n+ \"path\": \"\"\n+ },\n+ {\n+ \"name\": \"util-ktx\",\n+ \"version\": \"\",\n+ \"path\": \"\"\n+ },\n+ {\n+ \"name\": \"app-migration\",\n+ \"version\": \"\",\n+ \"path\": \"\"\n+ },\n+ {\n+ \"name\": \"shared-pref\",\n+ \"version\": \"\",\n+ \"path\": \"\"\n+ },\n+ {\n+ \"name\": \"custom-view\",\n+ \"version\": \"\",\n+ \"path\": \"\"\n+ },\n+ {\n+ \"name\": \"mvp-dialog\",\n+ \"version\": \"\",\n+ \"path\": \"\"\n+ },\n+ {\n+ \"name\": \"mvp-widget\",\n+ \"version\": \"\",\n+ \"path\": \"\"\n+ },\n+ {\n+ \"name\": \"picture-provider\",\n+ \"version\": \"\",\n+ \"path\": \"\"\n+ },\n+ {\n+ \"name\": \"imageloader\",\n+ \"version\": \"\",\n+ \"path\": \"\"\n+ },\n+ {\n+ \"name\": \"animations\",\n+ \"version\": \"\",\n+ \"path\": \"\"\n+ },\n+ {\n+ \"name\": \"broadcast-extension\",\n+ \"version\": \"\",\n+ \"path\": \"\"\n+ },\n+ {\n+ \"name\": \"message-controller\",\n+ \"version\": \"\",\n+ \"path\": \"\"\n+ },\n+ {\n+ \"name\": \"location\",\n+ \"version\": \"\",\n+ \"path\": \"\"\n+ },\n+ {\n+ \"name\": \"rxbus\",\n+ \"version\": \"\",\n+ \"path\": \"\"\n+ },\n+ {\n+ \"name\": \"activity-holder\",\n+ \"path\": \"\"\n+ }\n+]\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "settings.gradle",
"new_path": "settings.gradle",
"diff": "@@ -4,9 +4,9 @@ gradle.ext.extractModules('modules.json').each {\ninclude it.name\n}\n-gradle.ext.extractModules('samples.json').each {\n+/*gradle.ext.extractModules('samples.json').each {\ninclude it.name\n-}\n+}*/\n-apply from: 'template/settings.gradle'\n-apply from: 'security-sample-template/settings.gradle'\n\\ No newline at end of file\n+//apply from: 'template/settings.gradle'\n+//apply from: 'security-sample-template/settings.gradle'\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "test_plugin.gradle",
"diff": "+import com.sun.xml.internal.ws.resources.UtilMessages\n+\n+//TODO TEST FILE CLASS\n+\n+// todo test buildSrc Files\n+\n+import ru.surfstudio.android.build.Util //Not Resolved class fixed in Studio 3.5 canary 12.\n+Util.init(\"AAAAAAAAAAAAA\")\n+println Util.util()\n+\n+// todo test plugin\n+class GreetingPluginExtension {\n+ String message\n+ String greeter\n+\n+ void init() {\n+ println \"INIT BBBBB\"\n+ }\n+\n+}\n+\n+\n+extensions.create('greeting2', GreetingPluginExtension)\n+\n+/*class GreetingPlugin implements Plugin<Project> {\n+ void apply(Project project) {\n+ def extension = project.extensions.create('greeting', GreetingPluginExtension)\n+ *//*project.task('hello') {\n+ doLast {\n+ println \"${extension.message} from ${extension.greeter}\"\n+ }\n+ }*//*\n+ }\n+}\n+\n+apply plugin: GreetingPlugin*/\n+\n+// Configure the extension using a DSL block\n+greeting2 {\n+ message = 'Hi'\n+ greeter = 'Gradle AAAAA'\n+}\n+\n+greeting2.greeter = \"override\"\n+\n+greeting2.init()\n+\n+tasks.register(\"hello\") {\n+ group = 'Welcome'\n+ description = 'Produces a greeting'\n+\n+ doLast {\n+ println \"${greeting2.greeter}\"\n+ }\n+}\n+\n+\n+\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | add component json |
652,312 | 29.05.2019 11:51:55 | -10,800 | 7b730fba953f620207079988944bcc237963d019 | Set lines and maxLines to TitleSubtitleView programmatically | [
{
"change_type": "MODIFY",
"old_path": "custom-view/src/main/java/ru/surfstudio/android/custom/view/TitleSubtitleView.kt",
"new_path": "custom-view/src/main/java/ru/surfstudio/android/custom/view/TitleSubtitleView.kt",
"diff": "@@ -100,6 +100,30 @@ class TitleSubtitleView @JvmOverloads constructor(\nTextViewCompat.setTextAppearance(subTitleView, value)\n}\n+ var titleLines: Int = -1\n+ set(value) {\n+ field = value\n+ titleView.setLines(value)\n+ }\n+\n+ var subTitleLines: Int = -1\n+ set(value) {\n+ field = value\n+ subTitleView.setLines(value)\n+ }\n+\n+ var titleMaxLines: Int = -1\n+ set(value) {\n+ field = value\n+ titleView.maxLines = value\n+ }\n+\n+ var subTitleMaxLines: Int = -1\n+ set(value) {\n+ field = value\n+ subTitleView.maxLines = value\n+ }\n+\nvar onTitleClickListenerCallback: ((String) -> Unit)? = null\nset(value) {\nfield = value\n@@ -183,8 +207,8 @@ class TitleSubtitleView @JvmOverloads constructor(\nta.getDimensionPixelOffset(R.styleable.TitleSubtitleView_titlePaddingBottom, 0)\n)\n- setLines(ta.getInt(R.styleable.TitleSubtitleView_titleLines, lineCount))\n- maxLines = ta.getInt(R.styleable.TitleSubtitleView_titleMaxLines, DEFAULT_MAX_LINES)\n+ titleLines = ta.getInt(R.styleable.TitleSubtitleView_titleLines, lineCount)\n+ titleMaxLines = ta.getInt(R.styleable.TitleSubtitleView_titleMaxLines, DEFAULT_MAX_LINES)\ngravity = ta.getInt(R.styleable.TitleSubtitleView_titleGravity, gravity)\n@@ -226,8 +250,8 @@ class TitleSubtitleView @JvmOverloads constructor(\nta.getDimensionPixelOffset(R.styleable.TitleSubtitleView_subTitlePaddingBottom, 0)\n)\n- setLines(ta.getInt(R.styleable.TitleSubtitleView_subTitleLines, lineCount))\n- maxLines = ta.getInt(R.styleable.TitleSubtitleView_subTitleMaxLines, DEFAULT_MAX_LINES)\n+ subTitleLines = ta.getInt(R.styleable.TitleSubtitleView_subTitleLines, lineCount)\n+ subTitleMaxLines = ta.getInt(R.styleable.TitleSubtitleView_subTitleMaxLines, DEFAULT_MAX_LINES)\ngravity = ta.getInt(R.styleable.TitleSubtitleView_subTitleGravity, gravity)\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-512 Set lines and maxLines to TitleSubtitleView programmatically |
652,314 | 10.06.2019 16:10:15 | -10,800 | ac522f6fd2a4ffca86d1378cfd5b621705b964f8 | Refactoring JsonHelper | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/Initializator.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/Initializator.kt",
"diff": "@@ -5,7 +5,7 @@ import ru.surfstudio.android.build.exceptions.LibraryDirectoryNotExistException\nimport ru.surfstudio.android.build.exceptions.SampleDirectoryNotExistException\nimport ru.surfstudio.android.build.model.json.ComponentJson\nimport java.io.File\n-import com.google.gson.GsonBuilder\n+import ru.surfstudio.android.build.utils.JsonHelper\nobject Initializator {\n@@ -16,22 +16,11 @@ object Initializator {\n*/\n@JvmStatic\nfun init() {\n- val jsonComponents = parseComponentJson()\n+ val jsonComponents = JsonHelper.parseComponentsJson(COMPONENTS_JSON_FILE_PATH)\ncheckComponentsFolders(jsonComponents)\nComponents.init(jsonComponents)\n}\n- /**\n- * Parsing value.json file\n- * @return list of json value\n- */\n- private fun parseComponentJson(): List<ComponentJson> {\n- return GsonBuilder()\n- .create()\n- .fromJson(File(COMPONENTS_JSON_FILE_PATH).reader(), Array<ComponentJson>::class.java)\n- .toList()\n- }\n-\n/**\n* Check value directories for exist\n*/\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/IncrementUnstableChangedComponentsTask.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/IncrementUnstableChangedComponentsTask.kt",
"diff": "@@ -11,7 +11,7 @@ import ru.surfstudio.android.build.model.json.ComponentJson\nimport ru.surfstudio.android.build.tasks.changed_components.ComponentsConfigurationChecker\nimport ru.surfstudio.android.build.tasks.changed_components.ComponentsFilesChecker\nimport ru.surfstudio.android.build.tasks.changed_components.GitCommandRunner\n-import ru.surfstudio.android.build.tasks.changed_components.JsonHelper\n+import ru.surfstudio.android.build.utils.JsonHelper\nimport ru.surfstudio.android.build.tasks.changed_components.models.ComponentCheckResult\nimport java.io.File\n@@ -66,7 +66,7 @@ open class IncrementUnstableChangedComponentsTask : DefaultTask() {\n}\nprivate fun writeNewComponentsToFile(newComponents: List<Component>) {\n- JsonHelper.writeComponentsFile(\n+ JsonHelper.write(\nnewComponents.map { ComponentJson(it) },\nFile(\"$currentDirectory/$COMPONENTS_JSON_FILE_PATH\")\n)\n"
},
{
"change_type": "DELETE",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/changed_components/JsonHelper.kt",
"new_path": null,
"diff": "-package ru.surfstudio.android.build.tasks.changed_components\n-\n-import com.google.gson.GsonBuilder\n-import ru.surfstudio.android.build.Folders.COMPONENTS_JSON_FILE_PATH\n-import ru.surfstudio.android.build.model.json.ComponentJson\n-import ru.surfstudio.android.build.tasks.changed_components.models.ProjectConfiguration\n-import java.io.File\n-\n-/**\n- * helper for parsing info configuration files\n- */\n-object JsonHelper {\n-\n- val gson = GsonBuilder().setPrettyPrinting().create()\n-\n- fun parseProjectConfigurationFile(path: String): ProjectConfiguration {\n- return gson.fromJson(File(path).reader(), ProjectConfiguration::class.java)\n- }\n-\n- fun writeProjectConfigurationFile(project: ProjectConfiguration, file: File) {\n- file.writeText(gson.toJson(project))\n- }\n-\n- fun writeComponentsFile(components: List<ComponentJson>, file: File) {\n- file.writeText(gson.toJson(components))\n- }\n-\n- fun parseComponentsJson(pathToProject: String): List<ComponentJson> {\n- return GsonBuilder()\n- .create()\n- .fromJson(File(\"$pathToProject$COMPONENTS_JSON_FILE_PATH\").reader(), Array<ComponentJson>::class.java)\n- .toList()\n- }\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/changed_components/ProjectConfigurationCreator.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/changed_components/ProjectConfigurationCreator.kt",
"diff": "@@ -2,6 +2,7 @@ package ru.surfstudio.android.build.tasks.changed_components\nimport groovy.util.ConfigObject\nimport ru.surfstudio.android.build.Components\n+import ru.surfstudio.android.build.Folders\nimport ru.surfstudio.android.build.Folders.BUILD_FOLDER_NAME\nimport ru.surfstudio.android.build.Folders.BUILD_OUTPUT_FOLDER_PATH\nimport ru.surfstudio.android.build.Folders.OUTPUT_JSON_FOLDER_PATH\n@@ -11,6 +12,7 @@ import ru.surfstudio.android.build.tasks.changed_components.models.DependencyWit\nimport ru.surfstudio.android.build.tasks.changed_components.models.LibraryWithVersion\nimport ru.surfstudio.android.build.tasks.changed_components.models.ProjectConfiguration\nimport ru.surfstudio.android.build.tasks.currentDirectory\n+import ru.surfstudio.android.build.utils.JsonHelper\nimport java.io.File\n/**\n@@ -66,17 +68,17 @@ class ProjectConfigurationCreator(\n* and its version as second parameter\n*/\nprivate fun createComponentsWithVersions(versions: LinkedHashMap<String, String>): List<ComponentWithVersion> {\n- val components = JsonHelper.parseComponentsJson(pathToProject).map(ComponentJson::transform)\n+ val components = JsonHelper.parseComponentsJson(\"$pathToProject${Folders.COMPONENTS_JSON_FILE_PATH}\").map(ComponentJson::transform)\nreturn components.map { component ->\nval libs = component.libraries.map { lib ->\n- val standartDependencies = lib.androidStandardDependencies.map { dep ->\n+ val standardDependencies = lib.androidStandardDependencies.map { dep ->\nDependencyWithVersion(dep.name, versions[dep.name] ?: \"\")\n}\nval thirdPartyDependencies = lib.thirdPartyDependencies.map { dep ->\nDependencyWithVersion(dep.name, versions[dep.name] ?: \"\")\n}\n- LibraryWithVersion(lib.name, lib.directoryPath, thirdPartyDependencies, standartDependencies)\n+ LibraryWithVersion(lib.name, lib.directoryPath, thirdPartyDependencies, standardDependencies)\n}\nComponentWithVersion(component.name, component.directory, component.baseVersion, component.stable, libs)\n}\n@@ -89,7 +91,7 @@ class ProjectConfigurationCreator(\n*/\nprivate fun saveProjectConfigurationToFile(projectConfiguration: ProjectConfiguration) {\ncreateIntermediateFoldersForJsonFile()\n- JsonHelper.writeProjectConfigurationFile(projectConfiguration, createJsonOutputFile())\n+ JsonHelper.write(projectConfiguration, createJsonOutputFile())\n}\n/**\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/changed_components/ProjectConfigurationProvider.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/changed_components/ProjectConfigurationProvider.kt",
"diff": "@@ -9,6 +9,7 @@ import ru.surfstudio.android.build.GradleTasksNames.GRADLE_TASK_CREATE_PROJECT_C\nimport ru.surfstudio.android.build.tasks.changed_components.CommandLineRunner.runCommandWithResult\nimport ru.surfstudio.android.build.tasks.changed_components.models.ProjectConfiguration\nimport ru.surfstudio.android.build.tasks.currentDirectory\n+import ru.surfstudio.android.build.utils.JsonHelper\nimport java.io.File\n/**\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/utils/JsonHelper.kt",
"diff": "+package ru.surfstudio.android.build.utils\n+\n+import com.google.gson.GsonBuilder\n+import ru.surfstudio.android.build.Folders.COMPONENTS_JSON_FILE_PATH\n+import ru.surfstudio.android.build.model.json.ComponentJson\n+import ru.surfstudio.android.build.tasks.changed_components.models.ProjectConfiguration\n+import java.io.File\n+\n+/**\n+ * Helper class for parsing\n+ */\n+object JsonHelper {\n+\n+ private val gson = GsonBuilder().setPrettyPrinting().create()\n+\n+ fun parseProjectConfigurationFile(path: String): ProjectConfiguration {\n+ return gson.fromJson(File(path).reader(), ProjectConfiguration::class.java)\n+ }\n+\n+ /**\n+ * Write to file with json formatting\n+ *\n+ * @param obj - object for represent as json\n+ * @param file - file to write\n+ */\n+ fun write(obj: Any, file: File) {\n+ file.writeText(gson.toJson(obj))\n+ }\n+\n+ fun parseComponentsJson(filePath: String): List<ComponentJson> {\n+ return GsonBuilder()\n+ .create()\n+ .fromJson(File(filePath).reader(), Array<ComponentJson>::class.java)\n+ .toList()\n+ }\n+}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-528 Refactoring JsonHelper |
652,305 | 18.06.2019 13:53:51 | -10,800 | 0745fa0e390bac6f097cb309f357f5d61c38b943 | Fix widget binding. | [
{
"change_type": "MODIFY",
"old_path": "mvp-widget/src/main/java/ru/surfstudio/android/mvp/widget/configurator/BaseWidgetViewConfigurator.java",
"new_path": "mvp-widget/src/main/java/ru/surfstudio/android/mvp/widget/configurator/BaseWidgetViewConfigurator.java",
"diff": "@@ -69,6 +69,10 @@ public abstract class BaseWidgetViewConfigurator<P, M> implements ViewConfigurat\ncomponent = createScreenComponent();\n}\ncomponent.inject(target);\n+\n+ if (component instanceof BindableScreenComponent) {\n+ ((BindableScreenComponent) component).requestInjection();\n+ }\n}\nprivate ScreenComponent createScreenComponent() {\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Fix widget binding. |
652,303 | 21.06.2019 16:39:40 | -10,800 | 5d159feeb8ca63b850730c7ecc94b6a5bff63301 | RxBinding support for simple bottom sheet dialogs | [
{
"change_type": "MODIFY",
"old_path": "core-mvp-binding/src/main/java/ru/surfstudio/android/core/mvp/binding/rx/ui/BaseRxViews.kt",
"new_path": "core-mvp-binding/src/main/java/ru/surfstudio/android/core/mvp/binding/rx/ui/BaseRxViews.kt",
"diff": "@@ -126,3 +126,22 @@ abstract class BaseRxBottomSheetDialogFragment : CoreBottomSheetDialogFragmentVi\n.subscribe(onNext, Consumer(onError))\n.also { viewDisposable.add(it) }\n}\n+\n+/**\n+ * Simple Bottom Sheet Dialog Fragment with RxBindings support.\n+ */\n+abstract class BaseRxSimpleBottomSheetDialogFragment : CoreSimpleBottomSheetDialogFragment(), BindableRxView {\n+\n+ private val viewDisposable = CompositeDisposable()\n+\n+ @CallSuper\n+ override fun onDestroy() {\n+ viewDisposable.clear()\n+ super.onDestroy()\n+ }\n+\n+ override fun <T> subscribe(observable: Observable<T>, onNext: Consumer<T>, onError: (Throwable) -> Unit): Disposable =\n+ observable.observeOn(AndroidSchedulers.mainThread())\n+ .subscribe(onNext, Consumer(onError))\n+ .also { viewDisposable.add(it) }\n+}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-580 RxBinding support for simple bottom sheet dialogs |
652,314 | 26.06.2019 12:16:58 | -10,800 | b60c86fbc17e724887658522c3c5087bbe61e8f0 | branch-1 commit-1 | [
{
"change_type": "MODIFY",
"old_path": "logger/lib-logger/src/main/java/ru/surfstudio/android/logger/RemoteLogger.kt",
"new_path": "logger/lib-logger/src/main/java/ru/surfstudio/android/logger/RemoteLogger.kt",
"diff": "@@ -26,6 +26,7 @@ object RemoteLogger {\nprivate val REMOTE_LOGGING_STRATEGIES = hashMapOf<KClass<*>, RemoteLoggingStrategy>()\n@JvmStatic\n+\nfun getRemoteLoggingStrategies() = REMOTE_LOGGING_STRATEGIES\n@JvmStatic\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-538 branch-1 commit-1 |
652,314 | 26.06.2019 12:17:42 | -10,800 | 82e6fd08d42ab4de63993cde735081c845088583 | branch-1 commit-2 | [
{
"change_type": "MODIFY",
"old_path": "analytics/lib-analytics/src/main/java/ru/surfstudio/android/analytics/store/AnalyticsStore.java",
"new_path": "analytics/lib-analytics/src/main/java/ru/surfstudio/android/analytics/store/AnalyticsStore.java",
"diff": "@@ -50,6 +50,7 @@ public class AnalyticsStore implements Analytics {\n@Override\npublic void setUserProperty(String key, String value) {\n+\nStream.of(registeredList).forEach(val -> val.setUserProperty(key, value));\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "logger/lib-logger/src/main/java/ru/surfstudio/android/logger/RemoteLogger.kt",
"new_path": "logger/lib-logger/src/main/java/ru/surfstudio/android/logger/RemoteLogger.kt",
"diff": "@@ -30,6 +30,7 @@ object RemoteLogger {\nfun getRemoteLoggingStrategies() = REMOTE_LOGGING_STRATEGIES\n@JvmStatic\n+\nfun addRemoteLoggingStrategy(strategy: RemoteLoggingStrategy) =\nREMOTE_LOGGING_STRATEGIES.put(strategy::class, strategy)\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-538 branch-1 commit-2 |
652,314 | 26.06.2019 12:18:47 | -10,800 | bbb8c5debc4c53ef38ac7b4fd5590e6788f4b3ec | components-mirroring commit-1 | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/Components.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/Components.kt",
"diff": "@@ -56,6 +56,7 @@ object Components {\n* 4. X.Y.Z-alpha.unstable_version-projectPostfix.projectVersion - component is unstable, projectPostfix isn't empty\n*/\n@JvmStatic\n+\nfun getModuleVersion(moduleName: String): String {\nif (value.isEmpty()) return EMPTY_STRING\nif (value.any { it.projectVersion.isEmpty() }) configModuleVersions()\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-538 components-mirroring commit-1 |
652,314 | 26.06.2019 12:19:58 | -10,800 | db9215c6562ae66b4f332b991eaee2b2b4843428 | branch-3 commit-1 | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/Components.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/Components.kt",
"diff": "@@ -38,6 +38,8 @@ object Components {\n@JvmStatic\nfun getModules(): List<Module> {\nval mirrorComponentName = GradlePropertiesManager.getMirrorComponentName()\n+\n+\nreturn if (!GradlePropertiesManager.isCurrentComponentAMirror()) {\nvalue.flatMap(Component::getModules)\n} else {\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-538 branch-3 commit-1 |
652,314 | 26.06.2019 12:20:33 | -10,800 | 82d664f048add2bf266136fe2307e32d4269d970 | components-mirroring commit-2 | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/Components.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/Components.kt",
"diff": "@@ -59,6 +59,7 @@ object Components {\nfun getModuleVersion(moduleName: String): String {\nif (value.isEmpty()) return EMPTY_STRING\n+\nif (value.any { it.projectVersion.isEmpty() }) configModuleVersions()\nval component = value.find { it.getModules().map(Module::name).contains(moduleName) }\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-538 components-mirroring commit-2 |
652,345 | 02.07.2019 13:28:44 | -10,800 | 7bcccc369908794bed2a9506ae79a0c651b9a9aa | Fixed creating final commis to mirror | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/MirrorManager.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/MirrorManager.kt",
"diff": "package ru.surfstudio.android.build.tasks.deploy_to_mirror\n-import org.apache.commons.io.FileUtils\nimport org.eclipse.jgit.diff.DiffEntry\nimport org.eclipse.jgit.revwalk.RevCommit\nimport ru.surfstudio.android.build.exceptions.deploy_to_mirror.RevCommitNotFoundException\n@@ -12,8 +11,6 @@ import ru.surfstudio.android.build.utils.EMPTY_STRING\nimport ru.surfstudio.android.build.utils.mirrorStandardHash\nimport ru.surfstudio.android.build.utils.standardHash\nimport ru.surfstudio.android.build.utils.type\n-import java.io.File\n-import java.nio.charset.Charset\nprivate const val HEAD = \"HEAD\"\n@@ -83,16 +80,15 @@ class MirrorManager(\nstandardRepository.reset(commit.commit)\nwith(mirrorRepository) {\n- reset(getCommitByStandardHash(parent.commit.standardHash))\n- checkout(parent.branch)\n- checkout(commit.branch)\n+ checkoutBranch(parent.branch)\n+ if (parent.mirrorCommitHash.isNotEmpty()) {\n+ checkoutCommit(parent.mirrorCommitHash)\n}\n- applyChanges(changes)\n- mirrorRepository.commit(commit.commit)\n-\n- mirrorRepository.getCommitByStandardHash(\"b51eddbc\").parents.forEach {\n- println(\"123123 $it\")\n+ checkoutBranch(commit.branch)\n}\n+ applyChanges(changes)\n+ val commitHash = mirrorRepository.commit(commit.commit) ?: EMPTY_STRING\n+ commit.mirrorCommitHash = commitHash\n}\nprivate fun applyChanges(changes: List<DiffEntry>) {\n@@ -115,20 +111,22 @@ class MirrorManager(\n.map(CommitWithBranch::branch)\n.first { it != mainBranch }\n- mirrorRepository.checkout(mainBranch)\n+ mirrorRepository.checkoutBranch(mainBranch)\nval conflicts = mirrorRepository.merge(secondBranch)\nconflicts.forEach {\nval filePath = it.replaceFirst(\"${mirrorRepository.repositoryPath.path}/\", EMPTY_STRING)\ndiffManager.modify(filePath)\n}\n- mirrorRepository.commit(commit.commit)\n+\n+ val commitHash = mirrorRepository.commit(commit.commit)\n+ commit.mirrorCommitHash = commitHash ?: EMPTY_STRING\n}\nprivate fun mirrorStartPoint(commit: CommitWithBranch) {\nval mirrorCommit = gitTree.getStartMirrorCommitByStandardHash(commit.commit.standardHash)\nmirrorRepository.reset(mirrorCommit.commit)\n- mirrorRepository.checkout(mirrorCommit.branch)\n+ mirrorRepository.checkoutBranch(mirrorCommit.branch)\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/model/CommitWithBranch.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/model/CommitWithBranch.kt",
"diff": "@@ -6,7 +6,8 @@ import ru.surfstudio.android.build.utils.EMPTY_STRING\ndata class CommitWithBranch(\nval commit: RevCommit,\nvar branch: String = EMPTY_STRING,\n- var type: CommitType = CommitType.SIMPLE\n+ var type: CommitType = CommitType.SIMPLE,\n+ var mirrorCommitHash: String = EMPTY_STRING\n) {\noverride fun toString() = \"$type $branch ${commit.shortMessage}\"\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/repository/BaseGitRepository.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/repository/BaseGitRepository.kt",
"diff": "@@ -80,7 +80,7 @@ abstract class BaseGitRepository {\n.call()\n}\n- fun checkout(branchName: String) {\n+ fun checkoutBranch(branchName: String) {\nval isBranchCreated = git.branchList().call()\n.map { it.name }\n.extractBranchNames()\n@@ -92,6 +92,12 @@ abstract class BaseGitRepository {\n.call()\n}\n+ fun checkoutCommit(commitHash: String) {\n+ git.checkout()\n+ .setName(commitHash)\n+ .call()\n+ }\n+\nfun getChanges(commit: RevCommit): MutableList<DiffEntry> {\nval reader = git.repository.newObjectReader()\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/repository/MirrorRepository.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/repository/MirrorRepository.kt",
"diff": "@@ -10,11 +10,12 @@ import java.io.File\n*/\nclass MirrorRepository(dirPath: String) : BaseGitRepository() {\n- fun commit(commit: RevCommit) {\n- git.commit()\n+ fun commit(commit: RevCommit): String? {\n+ val resultCommit = git.commit()\n.setAuthor(commit.authorIdent)\n.setMessage(\"${commit.shortMessage} $STANDARD_COMMIT_HASH_PREFIX${commit.shortHash}$STANDARD_COMMIT_HASH_POSTFIX\")\n.call()\n+ return resultCommit.name\n}\noverride val repositoryPath = File(dirPath)\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Fixed creating final commis to mirror |
652,345 | 02.07.2019 16:26:48 | -10,800 | 7978c732aaff153c5956802f3c3b10cd2771a5e1 | Added comments to all except for GitTree | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/GradleProperties.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/GradleProperties.kt",
"diff": "@@ -57,7 +57,7 @@ object GradleProperties {\nconst val DEPLOY_ONLY_IF_NOT_EXIST = \"deployOnlyIfNotExist\"\n/**\n- * Number or commit\n+ * Commit in android standard to start mirroring from\n*/\nconst val COMMIT = \"commit\"\n@@ -67,12 +67,12 @@ object GradleProperties {\nconst val MIRROR_DIR = \"mirrorDir\"\n/**\n- * Depth limit for deploy to mirror\n+ * Depth of standard repository git tree to get commits\n*/\nconst val DEPLOY_TO_MIRROR_DEPTH_LIMIT = \"depthLimit\"\n/**\n- * Search limit for deploy to mirror\n+ * Depth of mirror repository tree to search standard commit hash in\n*/\nconst val DEPLOY_TO_MIRROR_SEARCH_LIMIT = \"searchLimit\"\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/DeployToMirrorTask.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/DeployToMirrorTask.kt",
"diff": "@@ -10,7 +10,7 @@ import ru.surfstudio.android.build.utils.extractProperty\nimport ru.surfstudio.android.build.utils.getPropertyComponent\n/**\n- * Deploy to mirror\n+ * Task for deploying [component] to mirror\n*/\nopen class DeployToMirrorTask : DefaultTask() {\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/GitDiffManager.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/GitDiffManager.kt",
"diff": "@@ -5,11 +5,19 @@ import org.eclipse.jgit.diff.DiffEntry\nimport ru.surfstudio.android.build.tasks.deploy_to_mirror.repository.MirrorRepository\nimport java.io.File\n+/**\n+ * Work with git changes\n+ */\nclass GitDiffManager(\nprivate val standardDir: String,\nprivate val mirrorRepository: MirrorRepository\n) {\n+ /**\n+ * work when file was added. Copy new standard file and add to index\n+ *\n+ * @param diffEntry information about diff\n+ */\nfun add(diffEntry: DiffEntry) {\nval standardFile = standardPath(diffEntry.newPath)\nval mirrorFile = mirrorPath(diffEntry.newPath)\n@@ -19,6 +27,11 @@ class GitDiffManager(\nmirrorRepository.addToIndex(mirrorFile.path)\n}\n+ /**\n+ * work when file was moved from one place to another. Copy file and add to index\n+ *\n+ * @param diffEntry information about diff\n+ */\nfun copy(diffEntry: DiffEntry) {\nval copyFrom = mirrorPath(diffEntry.oldPath)\nval copyTo = mirrorPath(diffEntry.newPath)\n@@ -28,6 +41,11 @@ class GitDiffManager(\nmirrorRepository.addToIndex(copyTo.path)\n}\n+ /**\n+ * work when file was deleted. Delete file and add to index\n+ *\n+ * @param diffEntry information about diff\n+ */\nfun delete(diffEntry: DiffEntry) {\nval file = mirrorPath(diffEntry.oldPath)\n@@ -36,9 +54,19 @@ class GitDiffManager(\nmirrorRepository.addToIndex(file.path)\n}\n+ /**\n+ * work when file was modified\n+ *\n+ * @param diffEntry information about diff\n+ */\nfun modify(diffEntry: DiffEntry) = modify(diffEntry.oldPath)\n+ /**\n+ * work when file was modified. Copies file from standard to mirror one\n+ *\n+ * @param filePath information about diff\n+ */\nfun modify(filePath: String) {\nval standardFile = standardPath(filePath)\nval mirrorFile = mirrorPath(filePath)\n@@ -48,6 +76,11 @@ class GitDiffManager(\nmirrorRepository.addToIndex(mirrorFile.path)\n}\n+ /**\n+ * work when file was renamed. Copy old file to new file name and remove old filename\n+ *\n+ * @param diffEntry information about diff\n+ */\nfun rename(diffEntry: DiffEntry) {\nval oldFile = mirrorPath(diffEntry.oldPath)\nval newFile = mirrorPath(diffEntry.newPath)\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/MirrorManager.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/MirrorManager.kt",
"diff": "@@ -15,7 +15,8 @@ import ru.surfstudio.android.build.utils.type\nprivate const val HEAD = \"HEAD\"\n/**\n- * Git manager\n+ * Class for mirroring android standard to mirror repository\n+ * Only [filesToMirror] and [foldersToMirror] are mirrored\n*/\nclass MirrorManager(\nprivate val componentDirectory: String,\n@@ -37,14 +38,15 @@ class MirrorManager(\n\"gradle.properties\",\n\"settings.gradle\"\n)\n- private val folderToMirror = listOf(\n+ private val foldersToMirror = listOf(\ncomponentDirectory,\n\"buildSrc\",\n\"common\"\n)\n/**\n- * Mirror standard repository and mirror repository\n+ * Mirrors standard repository to mirror repository.\n+ * Builds git tree presentation and then applies to mirror repository\n*\n* @param rootCommitHash - top commit for mirroring\n*/\n@@ -60,49 +62,74 @@ class MirrorManager(\n.toSet()\ngitTree.buildGitTree(rootCommit, standardCommits, mirrorCommits)\n- start()\n+ applyGitTreeToMirror()\n}\n- private fun start() {\n+ /**\n+ * For all git tree commits apply them to mirror repository\n+ */\n+ private fun applyGitTreeToMirror() {\ngitTree.commitsToCommit.forEach {\nwhen (it.type) {\nCommitType.SIMPLE -> commit(it)\nCommitType.MERGE -> merge(it)\n- CommitType.MIRROR_START_POINT -> mirrorStartPoint(it)\n+ CommitType.MIRROR_START_POINT -> createMirrorStartCommit(it)\n}\n}\n}\n- private fun commit(commit: CommitWithBranch) {\n- val changes = standardRepository.getChanges(commit.commit).filter(::shouldMirror)\n- val parent = gitTree.getParent(commit)\n+ /**\n+ * creates start commit of git tree in mirror repository\n+ *\n+ * @param commit start commit\n+ */\n+ private fun createMirrorStartCommit(commit: CommitWithBranch) {\n+ val mirrorCommit = gitTree.getStartMirrorCommitByStandardHash(commit.commit.standardHash)\n+ mirrorRepository.reset(mirrorCommit.commit)\n+ mirrorRepository.checkoutBranch(mirrorCommit.branch)\n+ }\n+ /**\n+ * creates commit in mirror repository by\n+ * getting all changes for [commit]\n+ * in standard repository and applying them to mirror repository\n+ *\n+ * @param commit commit to apply\n+ */\n+ private fun commit(commit: CommitWithBranch) {\nstandardRepository.reset(commit.commit)\n+ checkoutMirrorBranchForCommit(commit)\n- with(mirrorRepository) {\n- checkoutBranch(parent.branch)\n- if (parent.mirrorCommitHash.isNotEmpty()) {\n- checkoutCommit(parent.mirrorCommitHash)\n- }\n- checkoutBranch(commit.branch)\n- }\n+\n+ val changes = standardRepository.getChanges(commit.commit).filter(::shouldMirror)\napplyChanges(changes)\nval commitHash = mirrorRepository.commit(commit.commit) ?: EMPTY_STRING\ncommit.mirrorCommitHash = commitHash\n}\n- private fun applyChanges(changes: List<DiffEntry>) {\n- changes.forEach {\n- when (it.type) {\n- DiffEntry.ChangeType.ADD -> diffManager.add(it)\n- DiffEntry.ChangeType.COPY -> diffManager.copy(it)\n- DiffEntry.ChangeType.DELETE -> diffManager.delete(it)\n- DiffEntry.ChangeType.MODIFY -> diffManager.modify(it)\n- DiffEntry.ChangeType.RENAME -> diffManager.rename(it)\n+ /**\n+ * handles checkout right branch for new commit\n+ *\n+ * @param commit commit\n+ */\n+ private fun checkoutMirrorBranchForCommit(commit: CommitWithBranch) {\n+ with(mirrorRepository) {\n+ val parent = gitTree.getParent(commit)\n+ checkoutBranch(parent.branch)\n+ if (parent.mirrorCommitHash.isNotEmpty()) {\n+ checkoutCommit(parent.mirrorCommitHash)\n}\n+ checkoutBranch(commit.branch)\n}\n}\n+ /**\n+ * creates merge commit by getting merge parents for commit\n+ * and merging them.\n+ * In case of conflicts just copies file from standard repository to mirror repository\n+ *\n+ * @param commit commit to apply\n+ */\nprivate fun merge(commit: CommitWithBranch) {\nstandardRepository.reset(commit.commit)\n@@ -123,59 +150,30 @@ class MirrorManager(\ncommit.mirrorCommitHash = commitHash ?: EMPTY_STRING\n}\n- private fun mirrorStartPoint(commit: CommitWithBranch) {\n- val mirrorCommit = gitTree.getStartMirrorCommitByStandardHash(commit.commit.standardHash)\n- mirrorRepository.reset(mirrorCommit.commit)\n- mirrorRepository.checkoutBranch(mirrorCommit.branch)\n+ /**\n+ * apply changes to mirror repository\n+ *\n+ * @param changes list of changes to apply\n+ */\n+ private fun applyChanges(changes: List<DiffEntry>) {\n+ changes.forEach {\n+ when (it.type) {\n+ DiffEntry.ChangeType.ADD -> diffManager.add(it)\n+ DiffEntry.ChangeType.COPY -> diffManager.copy(it)\n+ DiffEntry.ChangeType.DELETE -> diffManager.delete(it)\n+ DiffEntry.ChangeType.MODIFY -> diffManager.modify(it)\n+ DiffEntry.ChangeType.RENAME -> diffManager.rename(it)\n+ }\n+ }\n}\n-\n- // private fun commitChanges() {\n-// val standardStartCommit = gitTree.getStandardStartCommit()\n-// val mirrorStartCommit = gitTree.getMirrorCommitByStandard(standardStartCommit.standardHash)\n-// val commits = gitTree.getCommitsWithChanges()\n-//\n-// if (commits.isEmpty()) return\n-//\n-// standardRepository.reset(standardStartCommit)\n-// standardRepository.checkout(standardStartCommit)\n-//\n-// mirrorRepository.reset(mirrorStartCommit)\n-// mirrorRepository.checkout(mirrorStartCommit)\n-//\n-// commits.forEach { handleCommit(it) }\n-// }\n-//\n-// private fun handleCommit(commit: RevCommit) {\n-// standardRepository.reset(commit)\n-// standardRepository.checkout(commit)\n-//\n-// if (commit.isMergeCommit) {\n-// merge(commit)\n-// } else {\n-// val diff = standardRepository.getChanges(commit)\n-// .filter(::shouldMirror)\n-// diff.forEach {\n-// when (it.type) {\n-// ADD -> diffManager.add(it)\n-// COPY -> diffManager.copy(it)\n-// DELETE -> diffManager.delete(it)\n-// MODIFY -> diffManager.modify(it)\n-// RENAME -> diffManager.rename(it)\n-// }\n-// }\n-// commit(commit)\n-// }\n-// }\n-//\n-// private fun merge(commit: RevCommit) {\n-// //TODO\n-// }\n-//\n-// private fun commit(commit: RevCommit) {\n-// mirrorRepository.commit(commit)\n-// }\n-//\n+ /**\n+ * check if should apply specified change to mirror repository\n+ *\n+ * @param diffEntry change to check\n+ *\n+ * @return true if specified change should be included in commit\n+ */\nprivate fun shouldMirror(diffEntry: DiffEntry): Boolean {\nval newPath = diffEntry.newPath.substringBeforeLast(\"/\")\nval oldPath = diffEntry.oldPath.substringBeforeLast(\"/\")\n@@ -189,7 +187,14 @@ class MirrorManager(\n}\n}\n+ /**\n+ * checks if this path is for specified objects to mirror\n+ *\n+ * @param path path to file\n+ *\n+ * @return true if changed file is contained in [filesToMirror] or [foldersToMirror]\n+ */\nprivate fun checkPathMirroring(path: String): Boolean {\n- return filesToMirror.contains(path) || folderToMirror.any { path.startsWith(it) }\n+ return filesToMirror.contains(path) || foldersToMirror.any { path.startsWith(it) }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/model/CommitWithBranch.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/model/CommitWithBranch.kt",
"diff": "@@ -3,6 +3,9 @@ package ru.surfstudio.android.build.tasks.deploy_to_mirror.model\nimport org.eclipse.jgit.revwalk.RevCommit\nimport ru.surfstudio.android.build.utils.EMPTY_STRING\n+/**\n+ * Commit for mirror repository\n+ */\ndata class CommitWithBranch(\nval commit: RevCommit,\nvar branch: String = EMPTY_STRING,\n@@ -13,6 +16,9 @@ data class CommitWithBranch(\noverride fun toString() = \"$type $branch ${commit.shortMessage}\"\n}\n+/**\n+ * State for commit: simple, merge commit and beginning of mirroring\n+ */\nenum class CommitType {\nSIMPLE, MERGE, MIRROR_START_POINT\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/repository/BaseGitRepository.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/repository/BaseGitRepository.kt",
"diff": "@@ -73,31 +73,11 @@ abstract class BaseGitRepository {\nreturn result\n}\n- fun reset(revCommit: RevCommit) {\n- git.reset()\n- .setMode(ResetCommand.ResetType.HARD)\n- .setRef(revCommit.name)\n- .call()\n- }\n-\n- fun checkoutBranch(branchName: String) {\n- val isBranchCreated = git.branchList().call()\n- .map { it.name }\n- .extractBranchNames()\n- .contains(branchName)\n-\n- git.checkout()\n- .setCreateBranch(!isBranchCreated)\n- .setName(branchName)\n- .call()\n- }\n-\n- fun checkoutCommit(commitHash: String) {\n- git.checkout()\n- .setName(commitHash)\n- .call()\n- }\n-\n+ /**\n+ * get all changes of commit\n+ *\n+ * @param commit commit to get changes for\n+ */\nfun getChanges(commit: RevCommit): MutableList<DiffEntry> {\nval reader = git.repository.newObjectReader()\n@@ -115,7 +95,24 @@ abstract class BaseGitRepository {\n.call()\n}\n- private fun getBranchName(commit: String): String {\n+ /**\n+ * Get branches by id\n+ *\n+ * @param id of object branch should contain\n+ * @return list of branches\n+ */\n+ fun getBranchesByContainsId(id: String): List<Ref> = git.branchList()\n+ .setListMode(ListBranchCommand.ListMode.ALL)\n+ .setContains(id)\n+ .call()\n+\n+ /**\n+ * get branch by commit\n+ *\n+ * @param commit hash of commit\n+ * @return branch name\n+ */\n+ fun getBranchNameByCommit(commit: String): String {\nval branches = git.branchList()\n.setContains(commit)\n.call()\n@@ -157,17 +154,54 @@ abstract class BaseGitRepository {\nreturn branches[0]\n}\n- fun getBranchById(id: String): Ref? = git.branchList()\n- .setListMode(ListBranchCommand.ListMode.ALL)\n+ /**\n+ * reset repository to commit\n+ *\n+ * @param revCommit commit to reset to\n+ */\n+ fun reset(revCommit: RevCommit) {\n+ git.reset()\n+ .setMode(ResetCommand.ResetType.HARD)\n+ .setRef(revCommit.name)\n.call()\n- .filter { it.name != \"HEAD\" }\n- .find { it.objectId.name == id }\n+ }\n- fun getBranchesByContainsId(id: String): List<Ref> = git.branchList()\n- .setListMode(ListBranchCommand.ListMode.ALL)\n- .setContains(id)\n+ /**\n+ * checkout branch by name. If not exist create\n+ *\n+ * @param branchName branch name for checkout\n+ */\n+ fun checkoutBranch(branchName: String) {\n+ val isBranchCreated = git.branchList().call()\n+ .map { it.name }\n+ .extractBranchNames()\n+ .contains(branchName)\n+\n+ git.checkout()\n+ .setCreateBranch(!isBranchCreated)\n+ .setName(branchName)\n+ .call()\n+ }\n+\n+ /**\n+ * checkout commit\n+ *\n+ * @param commitHash commit hash to checkout\n+ */\n+\n+ fun checkoutCommit(commitHash: String) {\n+ git.checkout()\n+ .setName(commitHash)\n.call()\n+ }\n+ /**\n+ * merge to current branch another one\n+ *\n+ * @param secondBranch branch to merge\n+ *\n+ * @return conflicts if there are any\n+ */\nfun merge(secondBranch: String) = git.merge()\n.setCommit(false)\n.include(getBranch(secondBranch))\n@@ -175,15 +209,23 @@ abstract class BaseGitRepository {\n?.conflicts\n?.map { it.key } ?: emptyList()\n+ /**\n+ * add to git index\n+ *\n+ * @param filePath path to file to add\n+ */\n+ fun addToIndex(filePath: String) = git.add()\n+ .addFilepattern(filePath)\n+ .call()\n- fun getBranch(refName: String): Ref {\n+ /**\n+ * get branch by name\n+ *\n+ * @param refName name of branch\n+ */\n+ private fun getBranch(refName: String): Ref {\nreturn git.branchList().call()\n.find { it.name.substringAfterLast(\"/\") == refName }\n?: throw BranchNotFoundException(refName)\n}\n-\n- fun addToIndex(filePath: String) = git.add()\n- .addFilepattern(filePath)\n- .call()\n-\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Added comments to all except for GitTree |
652,345 | 03.07.2019 13:30:02 | -10,800 | 82aa99667692e53774f5eb0716bf8bfeba84708c | Fixed creating tree, removed helper branches and restoring standard branches | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/MirrorManager.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/MirrorManager.kt",
"diff": "package ru.surfstudio.android.build.tasks.deploy_to_mirror\nimport org.eclipse.jgit.diff.DiffEntry\n+import org.eclipse.jgit.lib.Ref\nimport org.eclipse.jgit.revwalk.RevCommit\nimport ru.surfstudio.android.build.exceptions.deploy_to_mirror.RevCommitNotFoundException\nimport ru.surfstudio.android.build.tasks.deploy_to_mirror.model.CommitType\nimport ru.surfstudio.android.build.tasks.deploy_to_mirror.model.CommitWithBranch\nimport ru.surfstudio.android.build.tasks.deploy_to_mirror.repository.MirrorRepository\nimport ru.surfstudio.android.build.tasks.deploy_to_mirror.repository.StandardRepository\n-import ru.surfstudio.android.build.utils.EMPTY_STRING\n-import ru.surfstudio.android.build.utils.mirrorStandardHash\n-import ru.surfstudio.android.build.utils.standardHash\n-import ru.surfstudio.android.build.utils.type\n+import ru.surfstudio.android.build.utils.*\nprivate const val HEAD = \"HEAD\"\n@@ -63,6 +61,21 @@ class MirrorManager(\ngitTree.buildGitTree(rootCommit, standardCommits, mirrorCommits)\napplyGitTreeToMirror()\n+ setBranches(rootCommit)\n+ }\n+\n+ private fun setBranches(rootCommit: RevCommit) {\n+ val branchesToCreate = standardRepository.getBranchesByContainsId(rootCommit.name)\n+ .map(Ref::getName)\n+ .extractBranchNames()\n+ val rootCommitHashMirror = gitTree.commitsToCommit.filter {rootCommit.name == it.commit.name}.first().mirrorCommitHash\n+ branchesToCreate.forEach {branch ->\n+ mirrorRepository.createBranch(branch, rootCommitHashMirror)\n+ }\n+ mirrorRepository.checkoutBranch(branchesToCreate.first())\n+ gitTree.commitsToCommit.map { it.branch }.toSet().forEach {\n+ mirrorRepository.deleteBranch(it)\n+ }\n}\n/**\n@@ -87,6 +100,7 @@ class MirrorManager(\nval mirrorCommit = gitTree.getStartMirrorCommitByStandardHash(commit.commit.standardHash)\nmirrorRepository.reset(mirrorCommit.commit)\nmirrorRepository.checkoutBranch(mirrorCommit.branch)\n+ commit.mirrorCommitHash = mirrorCommit.commit.name\n}\n/**\n@@ -102,6 +116,7 @@ class MirrorManager(\nval changes = standardRepository.getChanges(commit.commit).filter(::shouldMirror)\n+ if (changes.isEmpty()) return\napplyChanges(changes)\nval commitHash = mirrorRepository.commit(commit.commit) ?: EMPTY_STRING\ncommit.mirrorCommitHash = commitHash\n@@ -115,7 +130,6 @@ class MirrorManager(\nprivate fun checkoutMirrorBranchForCommit(commit: CommitWithBranch) {\nwith(mirrorRepository) {\nval parent = gitTree.getParent(commit)\n- checkoutBranch(parent.branch)\nif (parent.mirrorCommitHash.isNotEmpty()) {\ncheckoutCommit(parent.mirrorCommitHash)\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/repository/BaseGitRepository.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/repository/BaseGitRepository.kt",
"diff": "@@ -218,6 +218,20 @@ abstract class BaseGitRepository {\n.addFilepattern(filePath)\n.call()\n+ /**\n+ * create branch\n+ */\n+ fun createBranch(branchName: String, startCommit: String){\n+ git.branchCreate().setForce(true).setName(branchName).setStartPoint(startCommit).call()\n+ }\n+\n+ /**\n+ * delete branch\n+ */\n+ fun deleteBranch(branchName: String){\n+ git.branchDelete().setBranchNames(branchName).setForce(true).call()\n+ }\n+\n/**\n* get branch by name\n*\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Fixed creating tree, removed helper branches and restoring standard branches |
652,345 | 03.07.2019 14:12:01 | -10,800 | 403c40f1e6695acf71b716a4b9c5e5463be02799 | Added check for emty merge branches and some refactor for gittree | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/GitTree.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/GitTree.kt",
"diff": "@@ -2,14 +2,18 @@ package ru.surfstudio.android.build.tasks.deploy_to_mirror\nimport org.eclipse.jgit.lib.Ref\nimport org.eclipse.jgit.revwalk.RevCommit\n-import ru.surfstudio.android.build.exceptions.deploy_to_mirror.*\n+import ru.surfstudio.android.build.exceptions.deploy_to_mirror.GitNodeNotFoundException\n+import ru.surfstudio.android.build.exceptions.deploy_to_mirror.ManyBranchesFoundException\n+import ru.surfstudio.android.build.exceptions.deploy_to_mirror.MirrorCommitNotFoundByStandardHashException\n+import ru.surfstudio.android.build.exceptions.deploy_to_mirror.NoEndsDefineException\nimport ru.surfstudio.android.build.tasks.deploy_to_mirror.model.CommitType\nimport ru.surfstudio.android.build.tasks.deploy_to_mirror.model.CommitWithBranch\nimport ru.surfstudio.android.build.tasks.deploy_to_mirror.repository.MirrorRepository\nimport ru.surfstudio.android.build.tasks.deploy_to_mirror.repository.StandardRepository\n-import ru.surfstudio.android.build.utils.*\n-\n-private const val HEAD = \"HEAD\"\n+import ru.surfstudio.android.build.utils.BranchCreator\n+import ru.surfstudio.android.build.utils.extractBranchNames\n+import ru.surfstudio.android.build.utils.mirrorStandardHash\n+import ru.surfstudio.android.build.utils.standardHash\n/**\n* Data structure based on tree\n@@ -21,48 +25,79 @@ class GitTree(\n) {\nprivate lateinit var rootNode: Node\n- private lateinit var rootCommitWithBranch: CommitWithBranch\n- private lateinit var mirrorNodes: Set<Node>\n- private val nodes: MutableSet<Node> = mutableSetOf()\n- private val commitsWithBranch: MutableSet<CommitWithBranch> = mutableSetOf()\n+ private val mirrorNodes: MutableSet<Node> = mutableSetOf()\n+ private val standardNodes: MutableSet<Node> = mutableSetOf()\n+\nlateinit var mirrorStartCommits: Set<CommitWithBranch>\n- lateinit var commitsToCommit: List<CommitWithBranch>\n+ lateinit var standardCommitsForMirror: List<CommitWithBranch>\n/**\n- * Build GitTree with correct structure\n+ * Build GitTree representation of standard repository with correct structure\n*/\nfun buildGitTree(\nrootRevCommit: RevCommit,\nstandardRevCommits: Iterable<RevCommit>,\nmirrorRevCommits: Iterable<RevCommit>\n) {\n- setRootNode(rootRevCommit)\n- setMirrorNodes(mirrorRevCommits)\n- addCommitsToTree(standardRevCommits)\n- cut()\n-// configureBranches()\n+ createRootNode(rootRevCommit)\n+ createMirrorNodes(mirrorRevCommits)\n+ createStandardNodes(standardRevCommits)\n-// commitsWithBranch\n-// .sortedBy { it.commit.commitTime }\n-// .forEach {\n-// println(\"Commit ${it.commit.name} - ${it.branch}\")\n-// }\n+ defineCommits()\n}\n- private fun setRootNode(value: RevCommit) {\n+ fun getStartMirrorCommitByStandardHash(standardHash: String): CommitWithBranch {\n+ return mirrorStartCommits.find { it.commit.mirrorStandardHash == standardHash }\n+ ?: throw MirrorCommitNotFoundByStandardHashException(standardHash)\n+ }\n+\n+ fun getParent(commit: CommitWithBranch): CommitWithBranch {\n+ val node = standardNodes.find { it.value == commit.commit }\n+ ?: throw GitNodeNotFoundException(commit.commit)\n+ return standardCommitsForMirror.find { it.commit == node.parents.first().value }\n+ ?: throw GitNodeNotFoundException(node.value)\n+ }\n+\n+ fun getMergeParents(commit: CommitWithBranch): List<CommitWithBranch> {\n+ val node = standardNodes.find { it.value == commit.commit }\n+ ?: throw GitNodeNotFoundException(commit.commit)\n+\n+ val parentRevCommits = node.parents.map { it.value }\n+\n+ return standardCommitsForMirror.filter { parentRevCommits.contains(it.commit) }\n+ }\n+\n+ /**\n+ * Add root node to standardNodes list\n+ *\n+ * @param value root commit\n+ */\n+ private fun createRootNode(value: RevCommit) {\nval node = Node(value).apply {\nstate = NodeState.ROOT\n}\nrootNode = node\n- nodes.add(node)\n+ standardNodes.add(node)\n}\n- private fun setMirrorNodes(mirrorRevCommits: Iterable<RevCommit>) {\n- mirrorNodes = mirrorRevCommits.map { Node(it).apply { state = NodeState.END } }.toSet()\n- nodes.addAll(mirrorNodes)\n+ /**\n+ * Add commits from mirror repository as mirror standardNodes\n+ *\n+ * @param mirrorRevCommits commits from mirror repository\n+ */\n+ private fun createMirrorNodes(mirrorRevCommits: Iterable<RevCommit>) {\n+ mirrorNodes.addAll(mirrorRevCommits.map { Node(it)}.toSet())\n+ if (mirrorNodes.isEmpty()) throw NoEndsDefineException()\n}\n- private fun addCommitsToTree(standardRevCommits: Iterable<RevCommit>) {\n+ /**\n+ * Finds all commits from standard repository that mirror doesnt have and adds them to standardNodes list\n+ * Starts from [rootNode], every iteration consists of taking parents of current node,\n+ * adding them to standardNodes list until meet commit from [mirrorNodes].\n+ *\n+ * @param standardRevCommits commits from standard repository\n+ */\n+ private fun createStandardNodes(standardRevCommits: Iterable<RevCommit>) {\nval c = mutableSetOf(rootNode.value)\nval p = mutableSetOf<RevCommit>()\n@@ -90,6 +125,12 @@ class GitTree(\n}\n}\n+ /**\n+ * adds commit to corresponded node and sets parents and children\n+ *\n+ * @param commit commit to add\n+ * @param parentCommits parents of commit\n+ */\nprivate fun addRevCommitToNodes(commit: RevCommit, parentCommits: List<RevCommit>) {\nval node = findNode(commit)\nval parents = parentCommits.map { findOrCreateNode(it) }\n@@ -99,28 +140,68 @@ class GitTree(\nnode.parents.add(parent)\n}\n- nodes.add(node)\n+ standardNodes.add(node)\n}\n- private fun cut() {\n- if (mirrorNodes.isEmpty()) throw NoEndsDefineException()\n+ /**\n+ * get node from [standardNodes] by commit\n+ *\n+ * @param value commit\n+ *\n+ * @return node\n+ */\n+ private fun findNode(value: RevCommit) = standardNodes.find { it.value == value }\n+ ?: throw GitNodeNotFoundException(value)\n- mirrorNodes.forEach { end ->\n- nodes.find {\n- it.value.standardHash == end.value.mirrorStandardHash\n- }?.state = NodeState.END\n+ /**\n+ * gets node from standardNodes or creates if not found\n+ *\n+ * @param value commit\n+ *\n+ * @return node\n+ */\n+ private fun findOrCreateNode(value: RevCommit): Node {\n+ var result = standardNodes.find { it.value == value }\n+\n+ if (result == null) {\n+ result = Node(value)\n+ standardNodes.add(result)\n}\n- nodes.removeAll(mirrorNodes)\n+ return result\n+ }\n- val ends = nodes.filter { it.state == NodeState.END }\n+ /**\n+ * mark all standardNodes in standardNodes list, that have mirrorStandardHash contained in mirrorNodes as END standardNodes\n+ */\n+ private fun markEndNodes() {\n+ mirrorNodes.forEach { mirrorNode ->\n+ standardNodes.find {\n+ it.value.standardHash == mirrorNode.value.mirrorStandardHash\n+ }?.state = NodeState.END\n+ }\n+ }\n- val lines: List<List<Node>> = ends.flatMap { end -> buildChain(mutableListOf(end)) }\n- .filter { ends.contains(it.first()) && it.last() == rootNode }\n+ /**\n+ * create commits models\n+ */\n+ private fun defineCommits(){\n+ val lines = createLines()\n- markNodes(lines)\nbuildMirrorStartCommits(lines)\n- defineCommitsToCommit(lines)\n+ buildStandardCommitsForMirror(lines)\n+ }\n+\n+ /**\n+ * creates lines: all ways from [rootNode] to end standardNodes\n+ */\n+ private fun createLines(): List<List<Node>> {\n+ markEndNodes()\n+\n+ val ends = standardNodes.filter { it.state == NodeState.END }\n+\n+ return ends.flatMap { end -> buildChain(mutableListOf(end)) }\n+ .filter { ends.contains(it.first()) && it.last() == rootNode }\n}\nprivate fun buildMirrorStartCommits(lines: List<List<Node>>) {\n@@ -138,19 +219,18 @@ class GitTree(\nif (branchNameNames.size != 1) {\nthrow ManyBranchesFoundException(it.value.name, branchNameNames)\n}\n-\nCommitWithBranch(it.value, branchNameNames[0])\n}.toSet()\n}\n- private fun defineCommitsToCommit(lines: List<List<Node>>) {\n+ private fun buildStandardCommitsForMirror(lines: List<List<Node>>) {\nval existedBranchNames = mirrorRepository.getAllBranches()\n.map { it.name }\n.extractBranchNames()\nval mirrorStartCommitsStandardHashes = mirrorStartCommits.map { it.commit.mirrorStandardHash }\n- commitsToCommit = nodes\n+ standardCommitsForMirror = standardNodes\n.map {\nval type = when {\nmirrorStartCommitsStandardHashes.contains(it.value.standardHash) -> {\n@@ -159,7 +239,6 @@ class GitTree(\nit.parents.size == 2 -> CommitType.MERGE\nelse -> CommitType.SIMPLE\n}\n-\nCommitWithBranch(commit = it.value, type = type)\n}\n.sortedBy { it.commit.commitTime }\n@@ -167,37 +246,15 @@ class GitTree(\nlines.forEach { line ->\nval branchName = BranchCreator.generateBranchName(existedBranchNames)\nline.forEach { node ->\n- val commit = commitsToCommit.find { it.commit == node.value }\n+ val commit = standardCommitsForMirror.find { it.commit == node.value }\nif (commit?.branch?.isEmpty() == true) commit.branch = branchName\n}\n}\n}\n-// /**\n-// * Return commits with changes that must be commit\n-// */\n-// fun getCommitsWithChanges(): List<RevCommit> = nodes\n-// .sortedBy { it.value.commitTime }\n-// .drop(1)\n-// .map(Node::value)\n-//\n-// /**\n-// * Return commit to start apply changes, but this commit already exist in mirror\n-// */\n-// fun getStandardStartCommit(): RevCommit = if (nodes.isEmpty()) {\n-// throw StartCommitNotFoundException()\n-// } else {\n-// nodes.minBy { it.value.commitTime }!!.value\n-// }\n-//\n-// fun getMirrorCommitByStandard(standardCommitHash: String): RevCommit = if (mirrorNodes.isEmpty()) {\n-// throw StartCommitNotFoundException()\n-// } else {\n-// mirrorNodes.find {\n-// it.value.mirrorStandardHash == standardCommitHash\n-// }?.value ?: throw StartCommitNotFoundException()\n-// }\n-\n+ /**\n+ * creates chain recursively\n+ */\nprivate fun buildChain(chain: MutableList<Node>): List<List<Node>> {\nval result: MutableList<List<Node>> = mutableListOf()\nvar node = chain.last()\n@@ -225,28 +282,9 @@ class GitTree(\n}\n}\n- private fun markNodes(lines: List<List<Node>>) {\n- lines.flatten()\n- .toSet()\n- .forEach {\n- if (it.state == NodeState.NONE) it.state = NodeState.MARKED\n- }\n- }\n-\n- private fun findNode(value: RevCommit) = nodes.find { it.value == value }\n- ?: throw GitNodeNotFoundException(value)\n-\n- private fun findOrCreateNode(value: RevCommit): Node {\n- var result = nodes.find { it.value == value }\n-\n- if (result == null) {\n- result = Node(value)\n- nodes.add(result)\n- }\n-\n- return result\n- }\n-\n+ /**\n+ * represents information about commit and its parents\n+ */\nprivate data class Node(\nval value: RevCommit,\nvar state: NodeState = NodeState.NONE,\n@@ -263,154 +301,16 @@ class GitTree(\n}\noverride fun toString(): String = \"${value.shortMessage} - $state\"\n-// \"{value:\\\"$value\\\", state:\\\"$state\\\", parents: \\\"${parents.map(Node::value)}\\\", x:\\\"${children.map(Node::value)}\\\"}\"\n}\n+ /**\n+ * State of node:\n+ * [NONE] - simple node\n+ * [END] - nodes that already have corresponded nodes in mirror repository\n+ * [ROOT] - node that corresponds commit hash in task parameter\n+ */\nprivate enum class NodeState {\n- NONE, END, ROOT, MARKED\n- }\n-\n-// //WORK WITH BRANCHES\n-// private fun configureBranches() {\n-// rootCommitWithBranch = CommitWithBranch(rootNode.value, getRootBranchName())\n-// var commitWithBranch = rootCommitWithBranch\n-// while (commitWithBranch.commit.parents.isNotEmpty()) {\n-// commitWithBranch = handelCommitWithBranch(commitWithBranch) ?: return\n-// }\n-// }\n-\n- private fun handelCommitWithBranch(commitWithBranch: CommitWithBranch): CommitWithBranch? {\n- commitsWithBranch.add(commitWithBranch)\n-\n- val parents = findNode(commitWithBranch.commit).parents\n- return when (parents.size) {\n- 0 -> null\n- 1 -> CommitWithBranch(parents.first().value, commitWithBranch.branch)\n- 2 -> merge(commitWithBranch)\n- else -> throw GitNodeParentException(commitWithBranch.toString())\n- }\n- }\n-\n- private fun merge(mergeCommit: CommitWithBranch): CommitWithBranch {\n- val parents = findNode(mergeCommit.commit).parents.toList()\n-\n- val firstParent = parents[0]\n- val secondParent = parents[1]\n- val startMergeCommit = CommitWithBranch(\n- findStartMergeCommit(firstParent, secondParent).value,\n- mergeCommit.branch\n- )\n-\n- val firstBranches = findBranch(firstParent.value.name)\n- val secondBranches = findBranch(secondParent.value.name)\n-\n- var firstCommitWithBranch: CommitWithBranch\n- var secondCommitWithBranch: CommitWithBranch\n-\n- if (firstBranches.size < secondBranches.size) {\n- firstCommitWithBranch = CommitWithBranch(\n- firstParent.value,\n- mergeCommit.branch\n- )\n- secondCommitWithBranch = CommitWithBranch(\n- secondParent.value,\n- getUnicBranch(mergeCommit, firstBranches, secondBranches)\n- )\n- } else {\n- firstCommitWithBranch = CommitWithBranch(\n- firstParent.value,\n- getUnicBranch(mergeCommit, secondBranches, firstBranches)\n- )\n- secondCommitWithBranch = CommitWithBranch(\n- secondParent.value,\n-\n- mergeCommit.branch\n- )\n- }\n-\n- while (firstCommitWithBranch.commit != startMergeCommit.commit) {\n- firstCommitWithBranch = handelCommitWithBranch(firstCommitWithBranch)\n- ?: return startMergeCommit\n- }\n-\n- while (secondCommitWithBranch.commit != startMergeCommit.commit) {\n- secondCommitWithBranch = handelCommitWithBranch(secondCommitWithBranch)\n- ?: return startMergeCommit\n- }\n-\n- return startMergeCommit\n- }\n-\n- private fun getUnicBranch(\n- mergeCommit: CommitWithBranch,\n- smallList: List<String>,\n- bigList: List<String>\n- ): String {\n- val list = bigList.filter { !smallList.contains(it) }\n- if (list.size != 1) {\n- throw MergesCommitBranchNotDefinedException(mergeCommit, smallList, bigList)\n- }\n- return list.first()\n- }\n-\n-// private fun getRootBranchName(): String {\n-// val id = rootNode.value.name\n-//\n-// var rootBranchName = standardRepository.getBranchById(id)?.name?.substringAfterLast(\"/\")\n-// ?: EMPTY_STRING\n-//\n-// if (rootBranchName.isEmpty()) rootBranchName = findBranch(id).first()\n-// if (rootBranchName.isEmpty()) throw BranchNotFoundException(id)\n-//\n-// return rootBranchName\n-// }\n-\n- private fun findBranch(id: String) = standardRepository.getBranchesByContainsId(id)\n- .map { it.name.substringAfterLast(\"/\") }\n- .distinct()\n- .filter { it != HEAD }\n-\n- private fun findStartMergeCommit(firstNode: Node, secondNode: Node): Node {\n- val firstParents = getAllParentNode(firstNode)\n- .filter { it.children.size > 1 }\n- val secondParents = getAllParentNode(secondNode)\n- .filter { it.children.size > 1 }\n-\n- return firstParents.filter { secondParents.contains(it) }.maxBy { it.value.commitTime }!!\n- }\n-\n- private fun getAllParentNode(node: Node): Set<Node> {\n- var parents = node.parents.toList()\n- val result = mutableSetOf<Node>().apply {\n- addAll(parents)\n- }\n- while (parents.isNotEmpty()) {\n- val praParents = parents.flatMap { it.parents }\n- result.addAll(praParents)\n- parents = praParents\n- }\n- return result\n- }\n-\n- fun getStartMirrorCommitByStandardHash(standardHash: String): CommitWithBranch {\n- return mirrorStartCommits.find { it.commit.mirrorStandardHash == standardHash }\n- ?: throw MirrorCommitNotFoundByStandardHashException(standardHash)\n- }\n-\n- fun getParent(commit: CommitWithBranch): CommitWithBranch {\n- val node = nodes.find { it.value == commit.commit }\n- ?: throw GitNodeNotFoundException(commit.commit)\n- return commitsToCommit.find { it.commit == node.parents.first().value }\n- ?: throw GitNodeNotFoundException(node.value)\n- }\n-\n- fun getMergeParents(commit: CommitWithBranch): List<CommitWithBranch> {\n- val node = nodes.find { it.value == commit.commit }\n- ?: throw GitNodeNotFoundException(commit.commit)\n-\n- val parentRevCommits = node.parents.map { it.value }\n-\n- return commitsToCommit.filter { parentRevCommits.contains(it.commit) }\n+ NONE, END, ROOT\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/MirrorManager.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/MirrorManager.kt",
"diff": "@@ -38,7 +38,6 @@ class MirrorManager(\n)\nprivate val foldersToMirror = listOf(\ncomponentDirectory,\n- \"buildSrc\",\n\"common\"\n)\n@@ -68,12 +67,12 @@ class MirrorManager(\nval branchesToCreate = standardRepository.getBranchesByContainsId(rootCommit.name)\n.map(Ref::getName)\n.extractBranchNames()\n- val rootCommitHashMirror = gitTree.commitsToCommit.filter {rootCommit.name == it.commit.name}.first().mirrorCommitHash\n+ val rootCommitHashMirror = gitTree.standardCommitsForMirror.filter {rootCommit.name == it.commit.name}.first().mirrorCommitHash\nbranchesToCreate.forEach {branch ->\nmirrorRepository.createBranch(branch, rootCommitHashMirror)\n}\nmirrorRepository.checkoutBranch(branchesToCreate.first())\n- gitTree.commitsToCommit.map { it.branch }.toSet().forEach {\n+ gitTree.standardCommitsForMirror.map { it.branch }.toSet().forEach {\nmirrorRepository.deleteBranch(it)\n}\n}\n@@ -82,7 +81,7 @@ class MirrorManager(\n* For all git tree commits apply them to mirror repository\n*/\nprivate fun applyGitTreeToMirror() {\n- gitTree.commitsToCommit.forEach {\n+ gitTree.standardCommitsForMirror.forEach {\nwhen (it.type) {\nCommitType.SIMPLE -> commit(it)\nCommitType.MERGE -> merge(it)\n@@ -112,11 +111,11 @@ class MirrorManager(\n*/\nprivate fun commit(commit: CommitWithBranch) {\nstandardRepository.reset(commit.commit)\n- checkoutMirrorBranchForCommit(commit)\n-\nval changes = standardRepository.getChanges(commit.commit).filter(::shouldMirror)\nif (changes.isEmpty()) return\n+\n+ checkoutMirrorBranchForCommit(commit)\napplyChanges(changes)\nval commitHash = mirrorRepository.commit(commit.commit) ?: EMPTY_STRING\ncommit.mirrorCommitHash = commitHash\n@@ -152,6 +151,8 @@ class MirrorManager(\n.map(CommitWithBranch::branch)\n.first { it != mainBranch }\n+ if (!mirrorRepository.isBranchExists(mainBranch) || !mirrorRepository.isBranchExists(secondBranch)) return\n+\nmirrorRepository.checkoutBranch(mainBranch)\nval conflicts = mirrorRepository.merge(secondBranch)\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/repository/BaseGitRepository.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/repository/BaseGitRepository.kt",
"diff": "@@ -172,17 +172,22 @@ abstract class BaseGitRepository {\n* @param branchName branch name for checkout\n*/\nfun checkoutBranch(branchName: String) {\n- val isBranchCreated = git.branchList().call()\n- .map { it.name }\n- .extractBranchNames()\n- .contains(branchName)\n-\ngit.checkout()\n- .setCreateBranch(!isBranchCreated)\n+ .setCreateBranch(!isBranchExists(branchName))\n.setName(branchName)\n.call()\n}\n+ /**\n+ *\n+ */\n+ fun isBranchExists(branchName: String):Boolean{\n+ return git.branchList().call()\n+ .map { it.name }\n+ .extractBranchNames()\n+ .contains(branchName)\n+ }\n+\n/**\n* checkout commit\n*\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Added check for emty merge branches and some refactor for gittree |
652,345 | 03.07.2019 16:50:56 | -10,800 | e60e4b106bdf2bb8d47ec6cb6839981da093ee0e | Fixed create branches after applying commits | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/MirrorManager.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/MirrorManager.kt",
"diff": "@@ -61,16 +61,16 @@ class MirrorManager(\ngitTree.buildGitTree(rootCommit, standardCommits, mirrorCommits)\napplyGitTreeToMirror()\n- setBranches(rootCommit)\n+ setBranches()\n}\n- private fun setBranches(rootCommit: RevCommit) {\n- val branchesToCreate = standardRepository.getBranchesByContainsId(rootCommit.name)\n+ private fun setBranches() {\n+ val commitToSetBranches = gitTree.standardCommitsForMirror.last { it.type == CommitType.COMMITED }\n+ val branchesToCreate = standardRepository.getBranchesByContainsId(commitToSetBranches.commit.name)\n.map(Ref::getName)\n.extractBranchNames()\n- val rootCommitHashMirror = gitTree.standardCommitsForMirror.filter {rootCommit.name == it.commit.name}.first().mirrorCommitHash\nbranchesToCreate.forEach {branch ->\n- mirrorRepository.createBranch(branch, rootCommitHashMirror)\n+ mirrorRepository.createBranch(branch, commitToSetBranches.mirrorCommitHash)\n}\nmirrorRepository.checkoutBranch(branchesToCreate.first())\ngitTree.standardCommitsForMirror.map { it.branch }.toSet().forEach {\n@@ -120,6 +120,7 @@ class MirrorManager(\napplyChanges(changes)\nval commitHash = mirrorRepository.commit(commit.commit) ?: EMPTY_STRING\ncommit.mirrorCommitHash = commitHash\n+ commit.type = CommitType.COMMITED\n}\n/**\n@@ -164,6 +165,7 @@ class MirrorManager(\nval commitHash = mirrorRepository.commit(commit.commit)\ncommit.mirrorCommitHash = commitHash ?: EMPTY_STRING\n+ commit.type = CommitType.COMMITED\n}\n/**\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/model/CommitWithBranch.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/model/CommitWithBranch.kt",
"diff": "@@ -20,5 +20,5 @@ data class CommitWithBranch(\n* State for commit: simple, merge commit and beginning of mirroring\n*/\nenum class CommitType {\n- SIMPLE, MERGE, MIRROR_START_POINT\n+ SIMPLE, MERGE, MIRROR_START_POINT, COMMITED\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Fixed create branches after applying commits |
652,345 | 03.07.2019 17:04:01 | -10,800 | 71f4df08b91bbb6a9722627357b938bffba230d0 | added comments for GitTree class | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/GitTree.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/GitTree.kt",
"diff": "@@ -28,8 +28,8 @@ class GitTree(\nprivate val mirrorNodes: MutableSet<Node> = mutableSetOf()\nprivate val standardNodes: MutableSet<Node> = mutableSetOf()\n- lateinit var mirrorStartCommits: Set<CommitWithBranch>\n- lateinit var standardCommitsForMirror: List<CommitWithBranch>\n+ lateinit var startMirrorRepositoryCommits: Set<CommitWithBranch>\n+ lateinit var standardRepositoryCommitsForMirror: List<CommitWithBranch>\n/**\n* Build GitTree representation of standard repository with correct structure\n@@ -46,25 +46,46 @@ class GitTree(\ndefineCommits()\n}\n+ /**\n+ * get start commit from mirror repository\n+ *\n+ * @param standardHash hash to find commit by\n+ *\n+ * @return commit with corresponded branch from start mirror repository commits\n+ */\nfun getStartMirrorCommitByStandardHash(standardHash: String): CommitWithBranch {\n- return mirrorStartCommits.find { it.commit.mirrorStandardHash == standardHash }\n+ return startMirrorRepositoryCommits.find { it.commit.mirrorStandardHash == standardHash }\n?: throw MirrorCommitNotFoundByStandardHashException(standardHash)\n}\n+ /**\n+ * get parent commit for specified commit\n+ *\n+ * @param commit commit to get parent for\n+ *\n+ * @return parent for commit\n+ */\nfun getParent(commit: CommitWithBranch): CommitWithBranch {\nval node = standardNodes.find { it.value == commit.commit }\n?: throw GitNodeNotFoundException(commit.commit)\n- return standardCommitsForMirror.find { it.commit == node.parents.first().value }\n+ return standardRepositoryCommitsForMirror.find { it.commit == node.parents.first().value }\n?: throw GitNodeNotFoundException(node.value)\n}\n+ /**\n+ * get parents commits for specified commit for merge\n+ *\n+ * @param commit commit to get parents for merge\n+ *\n+ * @return parents of specified commit\n+ */\nfun getMergeParents(commit: CommitWithBranch): List<CommitWithBranch> {\nval node = standardNodes.find { it.value == commit.commit }\n?: throw GitNodeNotFoundException(commit.commit)\nval parentRevCommits = node.parents.map { it.value }\n- return standardCommitsForMirror.filter { parentRevCommits.contains(it.commit) }\n+ return standardRepositoryCommitsForMirror.filter { parentRevCommits.contains(it.commit) }\n}\n/**\n@@ -183,7 +204,7 @@ class GitTree(\n}\n/**\n- * create commits models\n+ * create mirror repository started commits and standard repository commits\n*/\nprivate fun defineCommits(){\nval lines = createLines()\n@@ -204,10 +225,16 @@ class GitTree(\n.filter { ends.contains(it.first()) && it.last() == rootNode }\n}\n+ /**\n+ * creates mirror repository commits which branches models,\n+ * which are started for applying standard commits afterwards\n+ *\n+ * @param lines created lines in standard repository tree\n+ */\nprivate fun buildMirrorStartCommits(lines: List<List<Node>>) {\nval mirrorStandardHashes = lines.map { it.first().value.standardHash }\n- mirrorStartCommits = mirrorNodes\n+ startMirrorRepositoryCommits = mirrorNodes\n.filter {\nmirrorStandardHashes.contains(it.value.mirrorStandardHash)\n}\n@@ -223,14 +250,23 @@ class GitTree(\n}.toSet()\n}\n+ /**\n+ * creates from lines standard repository commit for applying to mirror. For every line branch name is created\n+ * Marks every commit either as:\n+ * MIRROR_START_POINT - commits that are already in mirror repository and applying commits started from\n+ * SIMPLE - usual commit\n+ * MERGE - merge commit\n+ *\n+ * @param lines created lines in standard repository tree\n+ */\nprivate fun buildStandardCommitsForMirror(lines: List<List<Node>>) {\nval existedBranchNames = mirrorRepository.getAllBranches()\n.map { it.name }\n.extractBranchNames()\n- val mirrorStartCommitsStandardHashes = mirrorStartCommits.map { it.commit.mirrorStandardHash }\n+ val mirrorStartCommitsStandardHashes = startMirrorRepositoryCommits.map { it.commit.mirrorStandardHash }\n- standardCommitsForMirror = standardNodes\n+ standardRepositoryCommitsForMirror = standardNodes\n.map {\nval type = when {\nmirrorStartCommitsStandardHashes.contains(it.value.standardHash) -> {\n@@ -246,7 +282,7 @@ class GitTree(\nlines.forEach { line ->\nval branchName = BranchCreator.generateBranchName(existedBranchNames)\nline.forEach { node ->\n- val commit = standardCommitsForMirror.find { it.commit == node.value }\n+ val commit = standardRepositoryCommitsForMirror.find { it.commit == node.value }\nif (commit?.branch?.isEmpty() == true) commit.branch = branchName\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/MirrorManager.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/MirrorManager.kt",
"diff": "@@ -65,7 +65,7 @@ class MirrorManager(\n}\nprivate fun setBranches() {\n- val commitToSetBranches = gitTree.standardCommitsForMirror.last { it.type == CommitType.COMMITED }\n+ val commitToSetBranches = gitTree.standardRepositoryCommitsForMirror.last { it.type == CommitType.COMMITED }\nval branchesToCreate = standardRepository.getBranchesByContainsId(commitToSetBranches.commit.name)\n.map(Ref::getName)\n.extractBranchNames()\n@@ -73,7 +73,7 @@ class MirrorManager(\nmirrorRepository.createBranch(branch, commitToSetBranches.mirrorCommitHash)\n}\nmirrorRepository.checkoutBranch(branchesToCreate.first())\n- gitTree.standardCommitsForMirror.map { it.branch }.toSet().forEach {\n+ gitTree.standardRepositoryCommitsForMirror.map { it.branch }.toSet().forEach {\nmirrorRepository.deleteBranch(it)\n}\n}\n@@ -82,7 +82,7 @@ class MirrorManager(\n* For all git tree commits apply them to mirror repository\n*/\nprivate fun applyGitTreeToMirror() {\n- gitTree.standardCommitsForMirror.forEach {\n+ gitTree.standardRepositoryCommitsForMirror.forEach {\nwhen (it.type) {\nCommitType.SIMPLE -> commit(it)\nCommitType.MERGE -> merge(it)\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | added comments for GitTree class |
652,345 | 08.07.2019 15:57:23 | -10,800 | ba2665cc9ed5cfd67f63d7e3aecc6973a7fb5eed | Implementing adding android standard local | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/buildTasks.gradle",
"new_path": "buildSrc/buildTasks.gradle",
"diff": "@@ -66,3 +66,5 @@ task setComponentAlphaCounterToZero(type: SetComponentAlphaCounterToZeroTask)\ntask checkReleaseNotesChanged(type: CheckReleaseNotesChangedTask)\ntask deployToMirror(type: DeployToMirrorTask)\n+\n+task generateModulesNamesFile(type: GenerateModuleNameFileTask)\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/ConfigInfoProvider.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/ConfigInfoProvider.kt",
"diff": "@@ -3,6 +3,7 @@ package ru.surfstudio.android.build\nimport com.google.gson.GsonBuilder\nimport ru.surfstudio.android.build.model.GlobalConfigInfo\nimport ru.surfstudio.android.build.model.json.ConfigInfoJson\n+import ru.surfstudio.android.build.utils.EMPTY_STRING\nimport ru.surfstudio.android.build.utils.JsonHelper\nimport java.io.File\n@@ -13,24 +14,33 @@ private const val CONFIG_INFO_JSON_FILE_PATH = \"buildSrc/projectConfiguration.js\n*/\nobject ConfigInfoProvider {\n- private val configInfoJsonFile = File(CONFIG_INFO_JSON_FILE_PATH)\n+ /**\n+ * specified only when running settings for ability to add android standard locally\n+ * otherwise will be empty\n+ */\n+ var currentDirectory = EMPTY_STRING\n- var globalConfigInfo: GlobalConfigInfo = parseProjectConfigInfoJson()\n+ private val configInfoJsonFile: File by lazy { openConfigInfoFile() }\n+ val globalConfigInfo: GlobalConfigInfo by lazy { parseProjectConfigInfoJson() }\nfun incrementUnstableVersion() {\n- globalConfigInfo = globalConfigInfo.copy(unstableVersion = globalConfigInfo.unstableVersion + 1)\n- JsonHelper.write(ConfigInfoJson(globalConfigInfo), configInfoJsonFile)\n+ val configInfo = globalConfigInfo.copy(unstableVersion = globalConfigInfo.unstableVersion + 1)\n+ JsonHelper.write(ConfigInfoJson(configInfo), configInfoJsonFile)\n}\nfun incrementProjectSnapshotVersion() {\n- globalConfigInfo = globalConfigInfo.copy(projectSnapshotVersion = globalConfigInfo.projectSnapshotVersion + 1)\n- JsonHelper.write(ConfigInfoJson(globalConfigInfo), configInfoJsonFile)\n+ val configInfo = globalConfigInfo.copy(projectSnapshotVersion = globalConfigInfo.projectSnapshotVersion + 1)\n+ JsonHelper.write(ConfigInfoJson(configInfo), configInfoJsonFile)\n}\n- private fun parseProjectConfigInfoJson(): GlobalConfigInfo = GsonBuilder().create()\n+ private fun parseProjectConfigInfoJson(): GlobalConfigInfo {\n+ return GsonBuilder().create()\n.fromJson(configInfoJsonFile.reader(), ConfigInfoJson::class.java)\n.transform()\n+ }\n+\n+ private fun openConfigInfoFile() = File(currentDirectory + CONFIG_INFO_JSON_FILE_PATH)\n@JvmStatic\n- private fun getVersion(): String = globalConfigInfo.version\n+ private fun getVersion() = globalConfigInfo.version\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/Initializator.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/Initializator.kt",
"diff": "@@ -10,53 +10,63 @@ import ru.surfstudio.android.build.utils.JsonHelper\nimport java.io.File\nobject Initializator {\n-\n/**\n* Parse value.json and create value\n+ * Added specifying current directory because of developed possibility to include android standard locally\n+ *\n+ * @param currentBuildDirectory directory of current setting project file\n*/\n@JvmStatic\n- fun init() {\n- val jsonComponents = JsonHelper.parseComponentsJson(COMPONENTS_JSON_FILE_PATH)\n+ fun init(currentBuildDirectory: String) {\n+ initConfigProviderWithCurrentDirectory(currentBuildDirectory)\n+ val jsonComponents = JsonHelper.parseComponentsJson(\"$currentBuildDirectory/$COMPONENTS_JSON_FILE_PATH\")\nif (GradlePropertiesManager.isCurrentComponentAMirror()) {\n- checkOnlyMirrorComponentFolder(jsonComponents)\n+ checkOnlyMirrorComponentFolder(jsonComponents, currentBuildDirectory)\n} else {\n- checkAllComponentsFolders(jsonComponents)\n+ checkAllComponentsFolders(jsonComponents, currentBuildDirectory)\n}\nComponents.init(jsonComponents)\n}\n- private fun checkOnlyMirrorComponentFolder(jsonComponents: List<ComponentJson>) {\n+ /**\n+ * set current directory for configuration provider\n+ */\n+ private fun initConfigProviderWithCurrentDirectory(currentDirectory: String) {\n+ ConfigInfoProvider.currentDirectory = \"$currentDirectory/\"\n+ }\n+\n+ private fun checkOnlyMirrorComponentFolder(jsonComponents: List<ComponentJson>, currentDirectory: String) {\nval componentMirrorName = GradlePropertiesManager.getMirrorComponentName()\nval component = jsonComponents.firstOrNull { it.id == componentMirrorName }\n?: throw ComponentNotFoundException(componentMirrorName)\n- checkComponentFolders(component)\n+ checkComponentFolders(component, currentDirectory)\n}\n/**\n* Check value directories for exist\n*/\n- private fun checkAllComponentsFolders(componentJsons: List<ComponentJson>) {\n+ private fun checkAllComponentsFolders(componentJsons: List<ComponentJson>, currentDirectory: String) {\ncomponentJsons.forEach { component ->\n- checkComponentFolders(component)\n+ checkComponentFolders(component, currentDirectory)\n}\n}\n- private fun checkComponentFolders(component: ComponentJson) {\n+ private fun checkComponentFolders(component: ComponentJson, currentDirectory: String) {\n//check component \"dir\"\n- if (!File(component.dir).exists()) {\n+ if (!File(\"$currentDirectory/${component.dir}\").exists()) {\nthrow ComponentDirectoryNotExistException(component.id)\n}\n//check libs\ncomponent.libs.forEach { lib ->\n- if (!File(\"${component.dir}/${lib.dir}\").exists()) {\n+ if (!File(\"$currentDirectory/${component.dir}/${lib.dir}\").exists()) {\nthrow LibraryDirectoryNotExistException(component.id, lib.name, lib.dir)\n}\n}\n//check samples\ncomponent.samples.forEach { sample ->\n- if (!File(\"${component.dir}/${sample.dir}\").exists()) {\n+ if (!File(\"$currentDirectory/${component.dir}/${sample.dir}\").exists()) {\nthrow SampleDirectoryNotExistException(component.id, sample.name)\n}\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/GenerateModuleNameFileTask.kt",
"diff": "+package ru.surfstudio.android.build.tasks\n+\n+import com.google.gson.GsonBuilder\n+import org.gradle.api.DefaultTask\n+import org.gradle.api.tasks.TaskAction\n+import ru.surfstudio.android.build.Components\n+import java.io.File\n+\n+/**\n+ * Task for generating data about versions to JSON file for version plugin\n+ * Do this task before deploy Android-Standard version plugin\n+ */\n+open class GenerateModuleNameFileTask : DefaultTask() {\n+\n+ companion object {\n+ private const val OUTPUT_DIR = \"buildSrc/\"\n+ private const val FILE_NAME = \"modules.json\"\n+ }\n+\n+ @TaskAction\n+ fun generate() {\n+ val gson = GsonBuilder().create()\n+ val moduleNames = (Components.value.flatMap { it.libraries }.map { library -> \"${library.name}\" })\n+ File(\"$OUTPUT_DIR/$FILE_NAME\").writeText(GsonBuilder().create().toJson(moduleNames))\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "settings.gradle",
"new_path": "settings.gradle",
"diff": "@@ -3,7 +3,9 @@ import ru.surfstudio.android.build.Initializator\nimport ru.surfstudio.android.build.Components\nimport ru.surfstudio.android.build.model.module.Module\n-Initializator.init()\n+def currentBuildDirectory = gradle.startParameter.currentDir.path\n+\n+Initializator.init(currentBuildDirectory)\nComponents.getModules().forEach { Module module ->\ninclude module.getGradleModuleName()\nproject(module.getGradleModuleName()).projectDir = new File(module.directoryPath)\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Implementing adding android standard local |
652,345 | 08.07.2019 16:03:37 | -10,800 | ad9049d1320f85e349d38296b6c371a2e5cdbc38 | changed exception text | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/config.gradle",
"new_path": "buildSrc/config.gradle",
"diff": "@@ -40,7 +40,7 @@ ext {\n\"io.reactivex.rxjava2:rxandroid\" : \"2.1.0\" //https://goo.gl/3Kd3iP\n]\n- gradlePluginVersion = '3.2.1' //https://bit.ly/2NXD4Pe\n+ gradlePluginVersion = '3.4.1' //https://bit.ly/2NXD4Pe\nbuildToolsVersion = \"28.0.3\" //https://bit.ly/2DNmq3Y\ngoogleServicesVersion = '4.2.0' //https://bit.ly/2Q5FCge\nbuildScanPluginVersion = '1.16' //https://goo.gl/coZHFo\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | changed exception text |
652,345 | 08.07.2019 16:10:06 | -10,800 | 41b3386c86b06ef1b8a18b6df1ce8c9578b3a41f | changed back plugin version | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/config.gradle",
"new_path": "buildSrc/config.gradle",
"diff": "@@ -40,7 +40,7 @@ ext {\n\"io.reactivex.rxjava2:rxandroid\" : \"2.1.0\" //https://goo.gl/3Kd3iP\n]\n- gradlePluginVersion = '3.4.1' //https://bit.ly/2NXD4Pe\n+ gradlePluginVersion = '3.2.1' //https://bit.ly/2NXD4Pe\nbuildToolsVersion = \"28.0.3\" //https://bit.ly/2DNmq3Y\ngoogleServicesVersion = '4.2.0' //https://bit.ly/2Q5FCge\nbuildScanPluginVersion = '1.16' //https://goo.gl/coZHFo\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | changed back plugin version |
652,337 | 24.07.2019 08:58:50 | -18,000 | 7077fa395643a6da3f887b02c9237a677355b3b9 | Fixed incorrect lifecycle in widgets | [
{
"change_type": "MODIFY",
"old_path": "mvp-widget/src/main/java/ru/surfstudio/android/mvp/widget/state/WidgetScreenState.java",
"new_path": "mvp-widget/src/main/java/ru/surfstudio/android/mvp/widget/state/WidgetScreenState.java",
"diff": "@@ -20,8 +20,8 @@ import android.view.View;\nimport ru.surfstudio.android.core.ui.ScreenType;\nimport ru.surfstudio.android.core.ui.state.ActivityScreenState;\n-import ru.surfstudio.android.core.ui.state.ScreenState;\nimport ru.surfstudio.android.core.ui.state.LifecycleStage;\n+import ru.surfstudio.android.core.ui.state.ScreenState;\nimport ru.surfstudio.android.mvp.widget.view.CoreWidgetViewInterface;\n/**\n@@ -38,6 +38,9 @@ public class WidgetScreenState implements ScreenState {\nprivate ScreenType parentType;\nprivate ScreenState parentState;\nprivate LifecycleStage lifecycleStage;\n+ private boolean viewDestroyedAtListOnce = false;\n+ private boolean viewRecreated = false;\n+ private boolean destroyed = false;\npublic WidgetScreenState(ScreenState parentState) {\nthis.parentState = parentState;\n@@ -50,6 +53,9 @@ public class WidgetScreenState implements ScreenState {\nthis.widget = widget;\nthis.coreWidget = coreWidget;\n+ viewRecreated = viewDestroyedAtListOnce;\n+ destroyed = false;\n+\nlifecycleStage = LifecycleStage.CREATED;\n}\n@@ -75,6 +81,8 @@ public class WidgetScreenState implements ScreenState {\npublic void onViewDestroy() {\nlifecycleStage = LifecycleStage.VIEW_DESTROYED;\n+ viewDestroyedAtListOnce = true;\n+ destroyed = true;\n}\npublic void onDestroy() {\n@@ -85,17 +93,17 @@ public class WidgetScreenState implements ScreenState {\n@Override\npublic boolean isViewRecreated() {\n- return parentState.isViewRecreated();\n+ return parentState.isViewRecreated() || viewRecreated;\n}\n@Override\npublic boolean isScreenRecreated() {\n- return parentState.isScreenRecreated();\n+ return this.isViewRecreated();\n}\n@Override\npublic boolean isCompletelyDestroyed() {\n- return parentState.isCompletelyDestroyed();\n+ return parentState.isCompletelyDestroyed() || destroyed;\n}\n@Override\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Fixed incorrect lifecycle in widgets |
652,323 | 26.07.2019 15:43:45 | -10,800 | 7a0eb3e77ada5dbe7c7da415b09d41e1960219f6 | fix verify release notes task | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/buildTasks.gradle",
"new_path": "buildSrc/buildTasks.gradle",
"diff": "@@ -5,7 +5,7 @@ import ru.surfstudio.android.build.tasks.deploy_to_mirror.*\ntask checkStandardDependenciesStableTask(type: CheckStandardDependenciesStableTask)\n-task checkStableComponentStandardDependenciesStableTask(type: CheckStableComponentStandardDependenciesStableTask)\n+task checkStableComponentStandardDependenciesStableTask(type: CheckStableComponentStandardDependenciesStableTask) //pr\ntask checkExistingDependencyArtifactsInArtifactory(type: CheckExistingDependencyArtifactsInArtifactoryTask)\n@@ -13,7 +13,7 @@ task checkExistingDependencyArtifactsInBintray(type: CheckExistingDependencyArti\ntask checkDependencyForComponentUnstable(type: CheckDependencyForComponentUnstableTask)\n-task checkStableComponentsChanged(type: CheckStableComponentsChangedTask)\n+task checkStableComponentsChanged(type: CheckStableComponentsChangedTask) //pr\ntask createProjectConfiguration(type: CreateProjectConfigurationTask)\n@@ -43,7 +43,7 @@ task checkSameDependencyArtifactsInArtifactory(type: CheckSameDependencyArtifact\ntask checkSameDependencyArtifactsInBintray(type: CheckSameDependencyArtifactsInBintrayTask)\n-task checkUnstableToStableChanged(type: CheckUnstableToStableChangedTask)\n+task checkUnstableToStableChanged(type: CheckUnstableToStableChangedTask) // pr\ntask checkComponentStable(type: CheckComponentStableTask)\n@@ -55,15 +55,15 @@ task incrementGlobalUnstableVersion(type: IncrementGlobalUnstableVersionTask)\ntask incrementProjectSnapshotVersion(type: IncrementProjectSnapshotVersionTask)\n-task checkReleaseNotesContainCurrentVersion(type: CheckReleaseNotesContainCurrentVersion)\n+task checkReleaseNotesContainCurrentVersion(type: CheckReleaseNotesContainCurrentVersion) //pr\n-task checkStableArtifactsExistInArtifactoryTask(type: CheckStableArtifactsExistInArtifactoryTask)\n+task checkStableArtifactsExistInArtifactoryTask(type: CheckStableArtifactsExistInArtifactoryTask) //pr\n-task checkStableArtifactsExistInBintrayTask(type: CheckStableArtifactsExistInBintrayTask)\n+task checkStableArtifactsExistInBintrayTask(type: CheckStableArtifactsExistInBintrayTask) //pr\ntask setComponentAlphaCounterToZero(type: SetComponentAlphaCounterToZeroTask)\n-task checkReleaseNotesChanged(type: CheckReleaseNotesChangedTask)\n+task checkReleaseNotesChanged(type: CheckReleaseNotesChangedTask) //pr\ntask deployToMirror(type: DeployToMirrorTask)\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/config.gradle",
"new_path": "buildSrc/config.gradle",
"diff": "@@ -43,7 +43,7 @@ ext {\ngradlePluginVersion = '3.2.1' //https://bit.ly/2NXD4Pe\nbuildToolsVersion = \"28.0.3\" //https://bit.ly/2DNmq3Y\ngoogleServicesVersion = '4.2.0' //https://bit.ly/2Q5FCge\n- buildScanPluginVersion = '1.16' //https://goo.gl/coZHFo\n+ buildScanPluginVersion = '2.0.2' //https://goo.gl/coZHFo\nfabricVersion = \"1.26.1\" //https://bit.ly/2OOly00\ncrashlyticsVersion = '2.9.6' //http://bit.ly/2v5mXbp\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/CheckReleaseNotesContainCurrentVersion.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/CheckReleaseNotesContainCurrentVersion.kt",
"diff": "@@ -6,6 +6,8 @@ import ru.surfstudio.android.build.ReleaseNotes\nimport ru.surfstudio.android.build.exceptions.release_notes.ReleaseNotesNotContainVersionException\nimport ru.surfstudio.android.build.model.release_notes.ReleaseNotesInfo\nimport ru.surfstudio.android.build.utils.getPropertyComponent\n+import ru.surfstudio.android.build.Components\n+\n/**\n* Check ReleaseNotes contain current project version\n@@ -14,7 +16,8 @@ open class CheckReleaseNotesContainCurrentVersion : DefaultTask() {\n@TaskAction\nfun check() {\n- val component = project.getPropertyComponent()\n+\n+ Components.value.forEach { component ->\nval releaseNotes: ReleaseNotesInfo = ReleaseNotes.findByComponentName(component.name)\n@@ -25,3 +28,4 @@ open class CheckReleaseNotesContainCurrentVersion : DefaultTask() {\nif (version.isEmpty) throw ReleaseNotesNotContainVersionException(releaseNotes, component.projectVersion)\n}\n}\n+}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | fix verify release notes task |
652,323 | 29.07.2019 16:44:12 | -10,800 | 1df13d7c3bf7e6de246cf29e6d3b4e937333db6b | add project-snapshot job | [
{
"change_type": "MODIFY",
"old_path": "ci-internal/DevDeployJobJenkinsfile.groovy",
"new_path": "ci-internal/DevDeployJobJenkinsfile.groovy",
"diff": "@@ -35,7 +35,6 @@ def MIRROR_COMPONENTS = 'Mirror Components'\n//constants\ndef projectConfigurationFile = \"buildSrc/projectConfiguration.json\"\n-def androidStandardVersionVarName = \"moduleVersionName\"\n//vars\ndef branchName = \"\"\n@@ -149,12 +148,16 @@ pipeline.stages = [\nAndroidPipelineHelper.staticCodeAnalysisStageBody(script)\n},\npipeline.stage(DEPLOY_MODULES) {\n+ withArtifactoryCredentials(script) {\nAndroidUtil.withGradleBuildCacheCredentials(script) {\nscript.sh \"./gradlew clean uploadArchives -PonlyUnstable=true -PdeployOnlyIfNotExist=true\"\n}\n+ }\n},\npipeline.stage(DEPLOY_GLOBAL_VERSION_PLUGIN) {\n+ withArtifactoryCredentials(script) {\nscript.sh \"./gradlew :android-standard-version-plugin:uploadArchives\"\n+ }\n},\npipeline.stage(VERSION_PUSH, StageStrategy.UNSTABLE_WHEN_STAGE_ERROR) {\nRepositoryUtil.setDefaultJenkinsGitUser(script)\n@@ -287,3 +290,14 @@ def static getPreviousRevisionWithVersionIncrement(script) {\n}\nreturn revisionToCompare\n}\n+\n+def static withArtifactoryCredentials(script, body) {\n+ script.withCredentials([\n+ script.usernamePassword(\n+ credentialsId: \"Artifactory_Deploy_Credentials\",\n+ usernameVariable: 'surf_maven_username',\n+ passwordVariable: 'surf_maven_password')\n+ ]) {\n+ body()\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "ci-internal/JenkinsfilePullRequestJob.groovy",
"new_path": "ci-internal/JenkinsfilePullRequestJob.groovy",
"diff": "@@ -131,8 +131,10 @@ pipeline.stages = [\nscript.sh \"git merge origin/$destinationBranch --no-ff\"\n},\npipeline.stage(CHECK_STABLE_MODULES_IN_ARTIFACTORY){\n+ withArtifactoryCredentials(script) {\nscript.sh(\"./gradlew checkStableArtifactsExistInArtifactoryTask\")\nscript.sh(\"./gradlew checkStableArtifactsExistInBintrayTask\")\n+ }\n},\npipeline.stage(CHECK_STABLE_MODULES_NOT_CHANGED){\nscript.sh(\"./gradlew checkStableComponentsChanged -PrevisionToCompare=${lastDestinationBranchCommitHash}\")\n@@ -191,3 +193,14 @@ pipeline.finalizeBody = {\npipeline.run()\n+def static withArtifactoryCredentials(script, body) {\n+ script.withCredentials([\n+ script.usernamePassword(\n+ credentialsId: \"Artifactory_Deploy_Credentials\",\n+ usernameVariable: 'surf_maven_username',\n+ passwordVariable: 'surf_maven_password')\n+ ]) {\n+ body()\n+ }\n+}\n+\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | add project-snapshot job |
652,323 | 05.08.2019 12:36:39 | -10,800 | 6ac7cafdd8b80e07a689a0c0b48b0f65d98510b9 | add release deploy job | [
{
"change_type": "MODIFY",
"old_path": "ci-internal/DevDeployJobJenkinsfile.groovy",
"new_path": "ci-internal/DevDeployJobJenkinsfile.groovy",
"diff": "@@ -156,6 +156,7 @@ pipeline.stages = [\n},\npipeline.stage(DEPLOY_GLOBAL_VERSION_PLUGIN) {\nwithArtifactoryCredentials(script) {\n+ script.sh \"./gradlew generateDataForPlugin\"\nscript.sh \"./gradlew :android-standard-version-plugin:uploadArchives\"\n}\n},\n"
},
{
"change_type": "MODIFY",
"old_path": "ci-internal/JenkinsfilePullRequestJob.groovy",
"new_path": "ci-internal/JenkinsfilePullRequestJob.groovy",
"diff": "@@ -26,8 +26,10 @@ def CHECK_STABLE_MODULES_IN_ARTIFACTORY = 'Check Stable Modules In Artifactory'\ndef CHECK_STABLE_MODULES_NOT_CHANGED = 'Check Stable Modules Not Changed'\ndef CHECK_UNSTABLE_MODULES_DO_NOT_BECAME_STABLE = 'Check Unstable Modules Do Not Bacame Stable'\ndef CHECK_MODULES_IN_DEPENDENCY_TREE_OF_STABLE_MODULE_ALSO_STABLE = 'Check Modules In Dependency Tree Of Stable Module Also Stable'\n-def CHECK_RELEASE_NOTES_VALID = 'Check Relese Notes Valid'\n-def CHECK_RELEASE_NOTES_CHANGED = 'Check Relese Notes Changed'\n+def CHECK_RELEASE_NOTES_VALID = 'Check Release Notes Valid'\n+def CHECK_RELEASE_NOTES_CHANGED = 'Check Release Notes Changed'\n+def CHECKS_RESULT = 'Checks Result'\n+\ndef BUILD = 'Build'\ndef UNIT_TEST = 'Unit Test'\ndef INSTRUMENTATION_TEST = 'Instrumentation Test'\n@@ -130,28 +132,46 @@ pipeline.stages = [\n//local merge with destination\nscript.sh \"git merge origin/$destinationBranch --no-ff\"\n},\n- pipeline.stage(CHECK_STABLE_MODULES_IN_ARTIFACTORY){\n+ pipeline.stage(CHECK_STABLE_MODULES_IN_ARTIFACTORY, StageStrategy.UNSTABLE_WHEN_STAGE_ERROR){\nwithArtifactoryCredentials(script) {\nscript.sh(\"./gradlew checkStableArtifactsExistInArtifactoryTask\")\nscript.sh(\"./gradlew checkStableArtifactsExistInBintrayTask\")\n}\n},\n- pipeline.stage(CHECK_STABLE_MODULES_NOT_CHANGED){\n+ pipeline.stage(CHECK_STABLE_MODULES_NOT_CHANGED, StageStrategy.UNSTABLE_WHEN_STAGE_ERROR){\nscript.sh(\"./gradlew checkStableComponentsChanged -PrevisionToCompare=${lastDestinationBranchCommitHash}\")\n},\n- pipeline.stage(CHECK_UNSTABLE_MODULES_DO_NOT_BECAME_STABLE){\n+ pipeline.stage(CHECK_UNSTABLE_MODULES_DO_NOT_BECAME_STABLE, StageStrategy.UNSTABLE_WHEN_STAGE_ERROR){\nscript.sh(\"./gradlew checkUnstableToStableChanged -PrevisionToCompare=${lastDestinationBranchCommitHash}\")\n},\n- pipeline.stage(CHECK_MODULES_IN_DEPENDENCY_TREE_OF_STABLE_MODULE_ALSO_STABLE){\n+ pipeline.stage(CHECK_MODULES_IN_DEPENDENCY_TREE_OF_STABLE_MODULE_ALSO_STABLE, StageStrategy.UNSTABLE_WHEN_STAGE_ERROR){\nscript.sh(\"./gradlew checkStableComponentStandardDependenciesStableTask\")\n},\n- pipeline.stage(CHECK_RELEASE_NOTES_VALID){\n+ pipeline.stage(CHECK_RELEASE_NOTES_VALID, StageStrategy.UNSTABLE_WHEN_STAGE_ERROR){\nscript.sh(\"./gradlew checkReleaseNotesContainCurrentVersion\")\n},\n- pipeline.stage(CHECK_RELEASE_NOTES_CHANGED){\n+ pipeline.stage(CHECK_RELEASE_NOTES_CHANGED, StageStrategy.UNSTABLE_WHEN_STAGE_ERROR){\nscript.sh(\"./gradlew checkReleaseNotesChanged -PrevisionToCompare=${lastDestinationBranchCommitHash}\")\n},\n+ pipeline.stage(CHECKS_RESULT) {\n+ def checksPassed = true\n+ [\n+ CHECK_STABLE_MODULES_IN_ARTIFACTORY,\n+ CHECK_STABLE_MODULES_NOT_CHANGED,\n+ CHECK_UNSTABLE_MODULES_DO_NOT_BECAME_STABLE,\n+ CHECK_MODULES_IN_DEPENDENCY_TREE_OF_STABLE_MODULE_ALSO_STABLE,\n+ CHECK_RELEASE_NOTES_VALID,\n+ CHECK_RELEASE_NOTES_CHANGED\n+ ].forEach {stageName ->\n+ def stageResult = pipeline.getStage(stageName).result\n+ checksPassed = checksPassed && (stageResult == Result.SUCCESS || stageResult == Result.NOT_BUILT)\n+ }\n+\n+ if(!checksPassed) {\n+ script.error(\"Checks Failed\")\n+ }\n+ },\npipeline.stage(BUILD){\nAndroidPipelineHelper.buildStageBodyAndroid(script, \"clean assemble\")\n"
},
{
"change_type": "MODIFY",
"old_path": "ci-internal/ProjectSnapshotDeployJobJenkinsfile.groovy",
"new_path": "ci-internal/ProjectSnapshotDeployJobJenkinsfile.groovy",
"diff": "@@ -148,6 +148,7 @@ pipeline.stages = [\n},\npipeline.stage(DEPLOY_GLOBAL_VERSION_PLUGIN) {\nwithArtifactoryCredentials(script) {\n+ script.sh \"./gradlew generateDataForPlugin\"\nscript.sh \"./gradlew :android-standard-version-plugin:uploadArchives\"\n}\n},\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | add release deploy job |
652,304 | 05.08.2019 19:47:44 | -10,800 | 342b9bed22dc8fcadb2146b0f7d12988d8da1023 | Code Style. ktlint plugin | [
{
"change_type": "MODIFY",
"old_path": "config.gradle",
"new_path": "config.gradle",
"diff": "@@ -42,6 +42,7 @@ ext {\nankoVersion = '0.10.8' //https://goo.gl/XGJGR7\nannimonStreamVersion = '1.2.1' //https://bit.ly/2Ke0nlQ\njetbrainsAnnotationsVersion = '17.0.0' //http://bit.ly/2NYf6Dt\n+ ktlintPluginVersion = '2.1.0' //https://bit.ly/2YLc3n8\n//DI\njavaInjectVersion = '1' //https://goo.gl/cM9Kcd\n"
},
{
"change_type": "MODIFY",
"old_path": "template/build.gradle",
"new_path": "template/build.gradle",
"diff": "@@ -15,10 +15,12 @@ buildscript {\nclasspath \"io.fabric.tools:gradle:$fabricVersion\"\nclasspath \"com.akaita.android:easylauncher:$easyLauncherVersion\"\nclasspath \"com.gradle:build-scan-plugin:$buildScanPluginVersion\"\n+ classpath \"org.jmailen.gradle:kotlinter-gradle:$ktlintPluginVersion\"\n}\n}\n-\nallprojects {\n+ apply plugin: \"org.jmailen.kotlinter\"\n+\nrepositories {\ngoogle()\njcenter()\n@@ -48,3 +50,4 @@ buildScan {\n}\napply from: \"scripts/dependenciesModules.gradle\"\n+apply from: \"scripts/ktFormatter.gradle\"\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-568 Code Style. ktlint plugin |
652,304 | 06.08.2019 17:45:56 | -10,800 | e591de5d75b51e5a392f110da5322f888cb27b3c | Bind model variance | [
{
"change_type": "MODIFY",
"old_path": "core-mvi/src/main/java/ru/surfstudio/android/core/mvi/ui/relation/StateEmitter.kt",
"new_path": "core-mvi/src/main/java/ru/surfstudio/android/core/mvi/ui/relation/StateEmitter.kt",
"diff": "@@ -15,7 +15,7 @@ interface StateEmitter : Related<PRESENTER> {\noverride fun relationEntity() = PRESENTER\n@CallSuper\n- override fun <T> subscribe(observable: Observable<T>, onNext: Consumer<T>, onError: (Throwable) -> Unit): Disposable {\n+ override fun <T> subscribe(observable: Observable<out T>, onNext: Consumer<T>, onError: (Throwable) -> Unit): Disposable {\nthrow NotImplementedError(\"StateEmitter cant manage subscription lifecycle\")\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "core-mvi/src/main/java/ru/surfstudio/android/core/mvi/ui/relation/StateObserver.kt",
"new_path": "core-mvi/src/main/java/ru/surfstudio/android/core/mvi/ui/relation/StateObserver.kt",
"diff": "@@ -15,7 +15,7 @@ interface StateObserver : Related<VIEW> {\noverride fun relationEntity() = VIEW\n@CallSuper\n- override fun <T> subscribe(observable: Observable<T>, onNext: Consumer<T>, onError: (Throwable) -> Unit): Disposable {\n+ override fun <T> subscribe(observable: Observable<out T>, onNext: Consumer<T>, onError: (Throwable) -> Unit): Disposable {\nthrow NotImplementedError(\"StateEmitter cant manage subscription lifecycle\")\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "core-mvi/src/test/java/ru/surfstudio/android/core/mvi/BaseReactTest.kt",
"new_path": "core-mvi/src/test/java/ru/surfstudio/android/core/mvi/BaseReactTest.kt",
"diff": "@@ -71,7 +71,7 @@ class TestView : Related<VIEW> {\noverride fun relationEntity(): VIEW = VIEW\n- override fun <T> subscribe(observable: Observable<T>,\n+ override fun <T> subscribe(observable: Observable<out T>,\nonNext: Consumer<T>,\nonError: (Throwable) -> Unit): Disposable =\nobservable.subscribe(onNext)\n"
},
{
"change_type": "MODIFY",
"old_path": "core-mvp-binding/src/main/java/ru/surfstudio/android/core/mvp/binding/rx/ui/BaseRxPresenter.kt",
"new_path": "core-mvp-binding/src/main/java/ru/surfstudio/android/core/mvp/binding/rx/ui/BaseRxPresenter.kt",
"diff": "@@ -43,7 +43,7 @@ abstract class BaseRxPresenter(\noverride fun relationEntity() = PRESENTER\n- override fun <T> subscribe(observable: Observable<T>,\n+ override fun <T> subscribe(observable: Observable<out T>,\nonNext: Consumer<T>,\nonError: (Throwable) -> Unit): Disposable =\nsuper.subscribe(observable, { onNext.accept(it) }, { onError(it) })\n"
},
{
"change_type": "MODIFY",
"old_path": "core-mvp-binding/src/main/java/ru/surfstudio/android/core/mvp/binding/rx/ui/BaseRxViews.kt",
"new_path": "core-mvp-binding/src/main/java/ru/surfstudio/android/core/mvp/binding/rx/ui/BaseRxViews.kt",
"diff": "@@ -46,7 +46,11 @@ abstract class BaseRxActivityView : CoreActivityView(), BindableRxView {\noverride fun getPresenters() = emptyArray<BaseRxPresenter>()\n- override fun <T> subscribe(observable: Observable<T>, onNext: Consumer<T>, onError: (Throwable) -> Unit): Disposable =\n+ override fun <T> subscribe(\n+ observable: Observable<out T>,\n+ onNext: Consumer<T>,\n+ onError: (Throwable) -> Unit\n+ ): Disposable =\nobservable.observeOn(AndroidSchedulers.mainThread())\n.subscribe(onNext, Consumer(onError))\n.also { viewDisposable.add(it) }\n@@ -67,7 +71,11 @@ abstract class BaseRxFragmentView : CoreFragmentView(), BindableRxView {\nsuper.onDestroy()\n}\n- override fun <T> subscribe(observable: Observable<T>, onNext: Consumer<T>, onError: (Throwable) -> Unit): Disposable =\n+ override fun <T> subscribe(\n+ observable: Observable<out T>,\n+ onNext: Consumer<T>,\n+ onError: (Throwable) -> Unit\n+ ): Disposable =\nobservable.observeOn(AndroidSchedulers.mainThread())\n.subscribe(onNext, Consumer(onError))\n.also { viewDisposable.add(it) }\n@@ -85,7 +93,11 @@ abstract class BaseRxDialogView : CoreDialogFragmentView(), BindableRxView {\nsuper.onDestroy()\n}\n- override fun <T> subscribe(observable: Observable<T>, onNext: Consumer<T>, onError: (Throwable) -> Unit): Disposable =\n+ override fun <T> subscribe(\n+ observable: Observable<out T>,\n+ onNext: Consumer<T>,\n+ onError: (Throwable) -> Unit\n+ ): Disposable =\nobservable.observeOn(AndroidSchedulers.mainThread())\n.subscribe(onNext, Consumer(onError))\n.also { viewDisposable.add(it) }\n@@ -103,7 +115,11 @@ abstract class BaseRxSimpleDialogFragment : CoreSimpleDialogFragment(), Related<\nsuper.onDestroy()\n}\n- override fun <T> subscribe(observable: Observable<T>, onNext: Consumer<T>, onError: (Throwable) -> Unit): Disposable =\n+ override fun <T> subscribe(\n+ observable: Observable<out T>,\n+ onNext: Consumer<T>,\n+ onError: (Throwable) -> Unit\n+ ): Disposable =\nobservable.observeOn(AndroidSchedulers.mainThread())\n.subscribe(onNext, Consumer(onError))\n.also { viewDisposable.add(it) }\n@@ -122,7 +138,11 @@ abstract class BaseRxBottomSheetDialogFragment : CoreBottomSheetDialogFragmentVi\nsuper.onDestroy()\n}\n- override fun <T> subscribe(observable: Observable<T>, onNext: Consumer<T>, onError: (Throwable) -> Unit): Disposable =\n+ override fun <T> subscribe(\n+ observable: Observable<out T>,\n+ onNext: Consumer<T>,\n+ onError: (Throwable) -> Unit\n+ ): Disposable =\nobservable.observeOn(AndroidSchedulers.mainThread())\n.subscribe(onNext, Consumer(onError))\n.also { viewDisposable.add(it) }\n@@ -141,7 +161,11 @@ abstract class BaseRxSimpleBottomSheetDialogFragment : CoreSimpleBottomSheetDial\nsuper.onDestroy()\n}\n- override fun <T> subscribe(observable: Observable<T>, onNext: Consumer<T>, onError: (Throwable) -> Unit): Disposable =\n+ override fun <T> subscribe(\n+ observable: Observable<out T>,\n+ onNext: Consumer<T>,\n+ onError: (Throwable) -> Unit\n+ ): Disposable =\nobservable.observeOn(AndroidSchedulers.mainThread())\n.subscribe(onNext, Consumer(onError))\n.also { viewDisposable.add(it) }\n"
},
{
"change_type": "MODIFY",
"old_path": "core-mvp-binding/src/test/java/ru/surfstudio/android/core/mvp/rx/relation/BaseRelationTest.kt",
"new_path": "core-mvp-binding/src/test/java/ru/surfstudio/android/core/mvp/rx/relation/BaseRelationTest.kt",
"diff": "@@ -46,7 +46,7 @@ class TestView : ru.surfstudio.android.core.mvp.binding.rx.relation.Related<VIEW\noverride fun relationEntity(): VIEW = VIEW\n- override fun <T> subscribe(observable: Observable<T>,\n+ override fun <T> subscribe(observable: Observable<out T>,\nonNext: Consumer<T>,\nonError: (Throwable) -> Unit): Disposable =\nobservable.subscribe(onNext)\n@@ -59,7 +59,7 @@ class TestPresenter : ru.surfstudio.android.core.mvp.binding.rx.relation.Related\noverride fun relationEntity(): PRESENTER = PRESENTER\n- override fun <T> subscribe(observable: Observable<T>,\n+ override fun <T> subscribe(observable: Observable<out T>,\nonNext: Consumer<T>,\nonError: (Throwable) -> Unit): Disposable =\nobservable.subscribe(onNext)\n"
},
{
"change_type": "MODIFY",
"old_path": "core-mvp-binding/src/test/java/ru/surfstudio/android/core/mvp/rx/relation/StateTest.kt",
"new_path": "core-mvp-binding/src/test/java/ru/surfstudio/android/core/mvp/rx/relation/StateTest.kt",
"diff": "package ru.surfstudio.android.core.mvp.rx.relation\n+import io.reactivex.Maybe\nimport io.reactivex.functions.Consumer\nimport io.reactivex.observers.TestObserver\n+import io.reactivex.subjects.PublishSubject\nimport org.junit.Assert.*\nimport org.junit.Before\nimport org.junit.Test\nimport ru.surfstudio.android.core.mvp.binding.rx.relation.mvp.State\n+import ru.surfstudio.android.core.mvp.binding.rx.ui.BindModel\nclass StateTest : BaseRelationTest() {\n@@ -93,4 +96,29 @@ class StateTest : BaseRelationTest() {\nassert(state.observable.test().isDisposed.not())\n}\n}\n+\n+ @Test\n+ @Throws(Exception::class)\n+ fun variance() {\n+ open class A\n+ class B : A()\n+\n+ val myInteractor = object {\n+ val foo = PublishSubject.create<B>()\n+ }\n+ val myBindModel = object : BindModel {\n+ val state = State<A>()\n+ }\n+\n+ with(testPresenter) {\n+ myInteractor.foo bindTo myBindModel.state\n+\n+ myInteractor.foo.onNext(B())\n+\n+ val state = myBindModel.state\n+ var newValue = A()\n+ state bindTo { newValue = it }\n+ assertTrue(newValue is B)\n+ }\n+ }\n}\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-657 Bind model variance |
652,321 | 08.08.2019 03:46:45 | 0 | af1bbf9dbf75c081d1bc93a707d5f7c6ea4022a4 | reduced component nesting by "merge" | [
{
"change_type": "MODIFY",
"old_path": "template/f-debug/src/main/res/layout/layout_title_subtitle_switch.xml",
"new_path": "template/f-debug/src/main/res/layout/layout_title_subtitle_switch.xml",
"diff": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\n+<merge xmlns:android=\"http://schemas.android.com/apk/res/android\"\nxmlns:app=\"http://schemas.android.com/apk/res-auto\"\n- xmlns:tools=\"http://schemas.android.com/tools\"\n+ android:layout_height=\"match_parent\"\nandroid:layout_width=\"match_parent\"\n- android:layout_height=\"wrap_content\"\n- android:background=\"?selectableItemBackground\">\n+ xmlns:tools=\"http://schemas.android.com/tools\"\n+ android:background=\"?selectableItemBackground\"\n+ tools:showIn=\"@layout/activity_memory_debug\">\n<TextView\nandroid:id=\"@+id/title_tv\"\nandroid:background=\"@android:color/darker_gray\"\napp:layout_constraintBottom_toBottomOf=\"parent\" />\n-</androidx.constraintlayout.widget.ConstraintLayout>\n\\ No newline at end of file\n+</merge>\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | reduced component nesting by "merge" |
652,314 | 20.08.2019 15:00:26 | -10,800 | 9be472e153480d7fd885ec5007d2927893b5d216 | extract baseBuild.gradle | [
{
"change_type": "MODIFY",
"old_path": "activity-holder/lib-activity-holder/build.gradle",
"new_path": "activity-holder/lib-activity-holder/build.gradle",
"diff": "-import ru.surfstudio.android.build.DependencyConfigurator\n-\n-apply from: '../../buildSrc/androidModule.gradle'\n-\n-DependencyConfigurator.configure(project)\n-configureDeploy(this)\n\\ No newline at end of file\n+apply from: '../../buildSrc/baseBuild.gradle'\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "analytics/lib-analytics/build.gradle",
"new_path": "analytics/lib-analytics/build.gradle",
"diff": "-import ru.surfstudio.android.build.DependencyConfigurator\n-\n-apply from: '../../buildSrc/androidModule.gradle'\n-\n-DependencyConfigurator.configure(project)\n-configureDeploy(this)\n\\ No newline at end of file\n+apply from: '../../buildSrc/baseBuild.gradle'\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "analytics/lib-firebase-analytics/build.gradle",
"new_path": "analytics/lib-firebase-analytics/build.gradle",
"diff": "-import ru.surfstudio.android.build.DependencyConfigurator\n-\n-apply from: '../../buildSrc/androidModule.gradle'\n-\n-DependencyConfigurator.configure(project)\n-configureDeploy(this)\n\\ No newline at end of file\n+apply from: '../../buildSrc/baseBuild.gradle'\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "animations/lib-animations/build.gradle",
"new_path": "animations/lib-animations/build.gradle",
"diff": "-import ru.surfstudio.android.build.DependencyConfigurator\n-\n-apply from: '../../buildSrc/androidModule.gradle'\n-\n-DependencyConfigurator.configure(project)\n-configureDeploy(this)\n\\ No newline at end of file\n+apply from: '../../buildSrc/baseBuild.gradle'\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "buildSrc/baseBuild.gradle",
"diff": "+import ru.surfstudio.android.build.DependencyConfigurator\n+\n+apply from: '../../buildSrc/androidModule.gradle'\n+\n+DependencyConfigurator.configure(project)\n+configureDeploy(this)\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "connection/lib-connection/build.gradle",
"new_path": "connection/lib-connection/build.gradle",
"diff": "-import ru.surfstudio.android.build.DependencyConfigurator\n-\n-apply from: '../../buildSrc/androidModule.gradle'\n-\n-DependencyConfigurator.configure(project)\n-configureDeploy(this)\n\\ No newline at end of file\n+apply from: '../../buildSrc/baseBuild.gradle'\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "core-ui/lib-core-ui/build.gradle",
"new_path": "core-ui/lib-core-ui/build.gradle",
"diff": "-import ru.surfstudio.android.build.DependencyConfigurator\n-\n-apply from: '../../buildSrc/androidModule.gradle'\n-\n-DependencyConfigurator.configure(project)\n-configureDeploy(this)\n\\ No newline at end of file\n+apply from: '../../buildSrc/baseBuild.gradle'\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "easyadapter/lib-easyadapter/build.gradle",
"new_path": "easyadapter/lib-easyadapter/build.gradle",
"diff": "-import ru.surfstudio.android.build.DependencyConfigurator\n-\n-apply from: '../../buildSrc/androidModule.gradle'\n-\n-DependencyConfigurator.configure(project)\n-configureDeploy(this)\n\\ No newline at end of file\n+apply from: '../../buildSrc/baseBuild.gradle'\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "logger/lib-logger/build.gradle",
"new_path": "logger/lib-logger/build.gradle",
"diff": "-import ru.surfstudio.android.build.DependencyConfigurator\n-\n-apply from: '../../buildSrc/androidModule.gradle'\n-\n-DependencyConfigurator.configure(project)\n-configureDeploy(this)\n\\ No newline at end of file\n+apply from: '../../buildSrc/baseBuild.gradle'\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "mvp/lib-core-mvp/build.gradle",
"new_path": "mvp/lib-core-mvp/build.gradle",
"diff": "-import ru.surfstudio.android.build.DependencyConfigurator\n-\n-apply from: '../../buildSrc/androidModule.gradle'\n-\n-DependencyConfigurator.configure(project)\n-configureDeploy(this)\n\\ No newline at end of file\n+apply from: '../../buildSrc/baseBuild.gradle'\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "mvp/lib-mvp-dialog/build.gradle",
"new_path": "mvp/lib-mvp-dialog/build.gradle",
"diff": "-import ru.surfstudio.android.build.DependencyConfigurator\n-\n-apply from: '../../buildSrc/androidModule.gradle'\n-\n-DependencyConfigurator.configure(project)\n-configureDeploy(this)\n\\ No newline at end of file\n+apply from: '../../buildSrc/baseBuild.gradle'\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "mvp/lib-mvp-widget/build.gradle",
"new_path": "mvp/lib-mvp-widget/build.gradle",
"diff": "-import ru.surfstudio.android.build.DependencyConfigurator\n-\n-apply from: '../../buildSrc/androidModule.gradle'\n-\n-DependencyConfigurator.configure(project)\n-configureDeploy(this)\n\\ No newline at end of file\n+apply from: '../../buildSrc/baseBuild.gradle'\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "rx-extension/lib-rx-extension/build.gradle",
"new_path": "rx-extension/lib-rx-extension/build.gradle",
"diff": "-import ru.surfstudio.android.build.DependencyConfigurator\n-\n-apply from: '../../buildSrc/androidModule.gradle'\n-\n-DependencyConfigurator.configure(project)\n-configureDeploy(this)\n\\ No newline at end of file\n+apply from: '../../buildSrc/baseBuild.gradle'\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "util-ktx/lib-util-ktx/build.gradle",
"new_path": "util-ktx/lib-util-ktx/build.gradle",
"diff": "-import ru.surfstudio.android.build.DependencyConfigurator\n-\n-apply from: '../../buildSrc/androidModule.gradle'\n-\n-DependencyConfigurator.configure(project)\n-configureDeploy(this)\n\\ No newline at end of file\n+apply from: '../../buildSrc/baseBuild.gradle'\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-534 extract baseBuild.gradle |
652,314 | 22.08.2019 16:56:15 | -10,800 | dc8b7f1d32ab62021452a1986b74c24e5750f32f | fix ui-test | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/androidSample.gradle",
"new_path": "buildSrc/androidSample.gradle",
"diff": "@@ -50,10 +50,8 @@ dependencies {\nDependencyConfigurator.implementation(project, \"org.jetbrains.anko:anko-common\")\nDependencyConfigurator.implementation(project, \"androidx.appcompat:appcompat\")\nDependencyConfigurator.implementation(project, \"androidx.constraintlayout:constraintlayout\")\n-}\n-\n-dependencies {\n+ DependencyConfigurator.projectAndroidTestImplementation(project, \"sample-common\")\n}\ntask printTestInstrumentationRunnerName {\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/DependencyConfigurator.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/DependencyConfigurator.kt",
"diff": "@@ -58,6 +58,40 @@ object DependencyConfigurator {\n}\n}\n+ /**\n+ * Add dependency to project with \"testImplementation\"\n+ * If current project is not mirror and dependency is not contained in current project then\n+ * add in with artifactory name else add locally\n+ *\n+ * @param project - project\n+ * @param dependencyName - dependency name\n+ */\n+ @JvmStatic\n+ fun projectTestImplementation(project: Project, dependencyName: String) {\n+ if (GradlePropertiesManager.isCurrentComponentAMirror() && !isProjectIncluded(project, dependencyName)) {\n+ addDependency(project, TEST_IMPLEMENTATION_DEP_TYPE, getDependencyArtifactoryName(dependencyName))\n+ } else {\n+ addDependency(project, TEST_IMPLEMENTATION_DEP_TYPE, project.rootProject.project(dependencyName))\n+ }\n+ }\n+\n+ /**\n+ * Add dependency to project with \"androidTestImplementation\"\n+ * If current project is not mirror and dependency is not contained in current project then\n+ * add in with artifactory name else add locally\n+ *\n+ * @param project - project\n+ * @param dependencyName - dependency name\n+ */\n+ @JvmStatic\n+ fun projectAndroidTestImplementation(project: Project, dependencyName: String) {\n+ if (GradlePropertiesManager.isCurrentComponentAMirror() && !isProjectIncluded(project, dependencyName)) {\n+ addDependency(project, ANDROID_TEST_IMPLEMENTATION_DEP_TYPE, getDependencyArtifactoryName(dependencyName))\n+ } else {\n+ addDependency(project, ANDROID_TEST_IMPLEMENTATION_DEP_TYPE, project.rootProject.project(dependencyName))\n+ }\n+ }\n+\n/**\n* Add dependency to project with \"implementation\"\n*\n"
},
{
"change_type": "MODIFY",
"old_path": "location/sample/build.gradle",
"new_path": "location/sample/build.gradle",
"diff": "@@ -13,5 +13,7 @@ dependencies {\nDependencyConfigurator.projectImplementation(project, \"location\")\nDependencyConfigurator.projectImplementation(project, \"picture-provider\")\n+ DependencyConfigurator.androidTestImplementation(project, \"androidx.test.uiautomator:uiautomator\")\n+\nDependencyConfigurator.kapt(project, \"com.google.dagger:dagger-compiler\")\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-534 fix ui-test |
652,314 | 23.08.2019 09:30:36 | -10,800 | e3ccd71e0a9235b2d289adfea68e6f18353df5b1 | all components unstable | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/components.json",
"new_path": "buildSrc/components.json",
"diff": "\"id\": \"activity-holder\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": true,\n+ \"stable\": false,\n\"dir\": \"activity-holder\",\n\"libs\": [\n{\n\"id\": \"analytics\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": true,\n+ \"stable\": false,\n\"dir\": \"analytics\",\n\"libs\": [\n{\n\"id\": \"animations\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": true,\n+ \"stable\": false,\n\"dir\": \"animations\",\n\"libs\": [\n{\n\"id\": \"app-migration\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": true,\n+ \"stable\": false,\n\"dir\": \"app-migration\",\n\"libs\": [\n{\n\"id\": \"broadcast-extension\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": true,\n+ \"stable\": false,\n\"dir\": \"broadcast-extension\",\n\"libs\": [\n{\n\"id\": \"common\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": true,\n+ \"stable\": false,\n\"dir\": \"common\",\n\"libs\": [\n{\n\"id\": \"connection\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": true,\n+ \"stable\": false,\n\"dir\": \"connection\",\n\"libs\": [\n{\n\"id\": \"core-app\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": true,\n+ \"stable\": false,\n\"dir\": \"core-app\",\n\"libs\": [\n{\n\"id\": \"core-mvi\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": true,\n+ \"stable\": false,\n\"dir\": \"core-mvi\",\n\"libs\": [\n{\n\"id\": \"core-mvp-binding\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": true,\n+ \"stable\": false,\n\"dir\": \"core-mvp-binding\",\n\"libs\": [\n{\n\"id\": \"core-ui\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": true,\n+ \"stable\": false,\n\"dir\": \"core-ui\",\n\"libs\": [\n{\n\"id\": \"custom-view\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": true,\n+ \"stable\": false,\n\"dir\": \"custom-view\",\n\"libs\": [\n{\n\"id\": \"dagger-scope\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": true,\n+ \"stable\": false,\n\"dir\": \"dagger-scope\",\n\"libs\": [\n{\n\"id\": \"datalist\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": true,\n+ \"stable\": false,\n\"dir\": \"datalist\",\n\"libs\": [\n{\n\"id\": \"deprecated\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": true,\n+ \"stable\": false,\n\"dir\": \"deprecated\",\n\"libs\": [\n{\n\"id\": \"easyadapter\",\n\"version\": \"1.0.0\",\n\"unstable_version\": 0,\n- \"stable\": true,\n+ \"stable\": false,\n\"dir\": \"easyadapter\",\n\"libs\": [\n{\n\"id\": \"filestorage\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": true,\n+ \"stable\": false,\n\"dir\": \"filestorage\",\n\"libs\": [\n{\n\"id\": \"imageloader\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": true,\n+ \"stable\": false,\n\"dir\": \"imageloader\",\n\"libs\": [\n{\n\"id\": \"location\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": true,\n+ \"stable\": false,\n\"dir\": \"location\",\n\"libs\": [\n{\n\"id\": \"logger\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 5,\n- \"stable\": true,\n+ \"stable\": false,\n\"dir\": \"logger\",\n\"libs\": [\n{\n\"id\": \"message-controller\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": true,\n+ \"stable\": false,\n\"dir\": \"message-controller\",\n\"libs\": [\n{\n\"id\": \"mvp\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": true,\n+ \"stable\": false,\n\"dir\": \"mvp\",\n\"libs\": [\n{\n\"id\": \"picture-provider\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": true,\n+ \"stable\": false,\n\"dir\": \"picture-provider\",\n\"libs\": [\n{\n\"id\": \"push\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": true,\n+ \"stable\": false,\n\"dir\": \"push\",\n\"libs\": [\n{\n\"id\": \"recycler-extension\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": true,\n+ \"stable\": false,\n\"dir\": \"recycler-extension\",\n\"libs\": [\n{\n\"id\": \"rx-extension\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": true,\n+ \"stable\": false,\n\"dir\": \"rx-extension\",\n\"libs\": [\n{\n\"id\": \"rxbus\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": true,\n+ \"stable\": false,\n\"dir\": \"rxbus\",\n\"libs\": [\n{\n\"id\": \"shared-pref\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": true,\n+ \"stable\": false,\n\"dir\": \"shared-pref\",\n\"libs\": [\n{\n\"id\": \"standard-dialog\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": true,\n+ \"stable\": false,\n\"dir\": \"standard-dialog\",\n\"libs\": [\n{\n\"id\": \"util-ktx\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": true,\n+ \"stable\": false,\n\"dir\": \"util-ktx\",\n\"libs\": [\n{\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-534 all components unstable |
652,314 | 26.08.2019 10:26:53 | -10,800 | 9008e2b5d184d02ea8afdd6e9023583ff2f80cab | Remoded all mirrors | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/components.json",
"new_path": "buildSrc/components.json",
"diff": "\"dir\": \"sample\"\n}\n],\n- \"has_mirror\": true,\n- \"mirror_repo\": \"https://github.com/surfstudio/Analytics\"\n+ \"has_mirror\": false,\n+ \"mirror_repo\": \"\"\n},\n{\n\"id\": \"animations\",\n\"dir\": \"sample\"\n}\n],\n- \"has_mirror\": true,\n- \"mirror_repo\": \"https://github.com/surfstudio/EasyAdapter\"\n+ \"has_mirror\": false,\n+ \"mirror_repo\": \"\"\n},\n{\n\"id\": \"filestorage\",\n}\n],\n\"samples\": [],\n- \"has_mirror\": true,\n- \"mirror_repo\": \"https://github.com/surfstudio/Logger\"\n+ \"has_mirror\": false,\n+ \"mirror_repo\": \"\"\n},\n{\n\"id\": \"message-controller\",\n}\n],\n\"samples\": [],\n- \"has_mirror\": true,\n- \"mirror_repo\": \"https://github.com/surfstudio/Rx-extension\"\n+ \"has_mirror\": false,\n+ \"mirror_repo\": \"\"\n},\n{\n\"id\": \"rxbus\",\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-534 Remoded all mirrors |
652,314 | 26.08.2019 11:58:27 | -10,800 | 439724b3bfbd495302b90378b153ea219b21460b | added Rx-extension mirror | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/components.json",
"new_path": "buildSrc/components.json",
"diff": "}\n],\n\"samples\": [],\n- \"has_mirror\": false,\n- \"mirror_repo\": \"\"\n+ \"has_mirror\": true,\n+ \"mirror_repo\": \"https://github.com/surfstudio/Rx-extension\"\n},\n{\n\"id\": \"rxbus\",\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-534 added Rx-extension mirror |
652,314 | 26.08.2019 17:50:39 | -10,800 | 2053cbde260173319a32272b3cba195bc901302d | deploy only if artifact name is not null | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/buildTasks.gradle",
"new_path": "buildSrc/buildTasks.gradle",
"diff": "@@ -78,6 +78,8 @@ task distributeArtifactsToBintrayTask(type: DistributeArtifactsToBintrayTask) //\ntask uploadArchiveComponentsTask(type: UploadArchiveComponentsTask){\nComponents.libraries.each {\n+ if(it.artifactName != \"\") {\ndependsOn \":${it.name}:uploadArchives\"\n}\n}\n+}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-534 deploy only if artifact name is not null |
652,314 | 27.08.2019 12:18:02 | -10,800 | 6140053c651813b75b7ac78c8d773f99d56aa4a9 | fix group id | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/components.json",
"new_path": "buildSrc/components.json",
"diff": "{\n\"id\": \"analytics\",\n\"version\": \"0.4.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"analytics\",\n\"libs\": [\n{\n\"id\": \"animations\",\n\"version\": \"0.4.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"animations\",\n\"libs\": [\n{\n\"id\": \"app-migration\",\n\"version\": \"0.4.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"app-migration\",\n\"libs\": [\n{\n\"id\": \"broadcast-extension\",\n\"version\": \"0.4.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"broadcast-extension\",\n\"libs\": [\n{\n\"id\": \"common\",\n\"version\": \"0.4.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"common\",\n\"libs\": [\n{\n\"id\": \"connection\",\n\"version\": \"0.4.0\",\n- \"unstable_version\": 1,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"connection\",\n\"libs\": [\n{\n\"id\": \"converter-gson\",\n\"version\": \"0.4.0\",\n- \"unstable_version\": 1,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"deprecated/converter-gson\",\n\"libs\": [\n{\n\"id\": \"core-app\",\n\"version\": \"0.4.0\",\n- \"unstable_version\": 1,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"deprecated/core-app\",\n\"libs\": [\n{\n\"id\": \"core-mvi\",\n\"version\": \"0.4.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"core-mvi\",\n\"libs\": [\n{\n\"id\": \"core-mvp-binding\",\n\"version\": \"0.4.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"core-mvp-binding\",\n\"libs\": [\n{\n\"id\": \"core-ui\",\n\"version\": \"0.4.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"core-ui\",\n\"libs\": [\n{\n\"id\": \"custom-view\",\n\"version\": \"0.4.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"custom-view\",\n\"libs\": [\n{\n\"id\": \"dagger-scope\",\n\"version\": \"0.4.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"dagger-scope\",\n\"libs\": [\n{\n\"id\": \"datalist\",\n\"version\": \"0.4.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"datalist\",\n\"libs\": [\n{\n\"id\": \"easyadapter\",\n\"version\": \"1.0.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"easyadapter\",\n\"libs\": [\n{\n\"id\": \"filestorage\",\n\"version\": \"0.4.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"filestorage\",\n\"libs\": [\n{\n\"id\": \"imageloader\",\n\"version\": \"0.4.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"imageloader\",\n\"libs\": [\n{\n\"id\": \"location\",\n\"version\": \"0.4.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"location\",\n\"libs\": [\n{\n\"id\": \"logger\",\n\"version\": \"0.4.0\",\n- \"unstable_version\": 6,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"logger\",\n\"libs\": [\n{\n\"id\": \"message-controller\",\n\"version\": \"0.4.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"message-controller\",\n\"libs\": [\n{\n\"id\": \"mvp\",\n\"version\": \"0.4.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"mvp\",\n\"libs\": [\n{\n\"id\": \"network\",\n\"version\": \"0.4.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"deprecated/network\",\n\"libs\": [\n{\n\"id\": \"picture-provider\",\n\"version\": \"0.4.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"picture-provider\",\n\"libs\": [\n{\n\"id\": \"push\",\n\"version\": \"0.4.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"push\",\n\"libs\": [\n{\n\"id\": \"recycler-extension\",\n\"version\": \"0.4.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"recycler-extension\",\n\"libs\": [\n{\n\"id\": \"rxbus\",\n\"version\": \"0.4.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"rxbus\",\n\"libs\": [\n{\n\"id\": \"security\",\n\"version\": \"0.4.0\",\n- \"unstable_version\": 1,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"security\",\n\"libs\": [\n{\n\"id\": \"shared-pref\",\n\"version\": \"0.4.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"shared-pref\",\n\"libs\": [\n{\n\"id\": \"standard-dialog\",\n\"version\": \"0.4.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"standard-dialog\",\n\"libs\": [\n{\n\"id\": \"util-ktx\",\n\"version\": \"0.4.0\",\n- \"unstable_version\": 1,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"util-ktx\",\n\"libs\": [\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/projectConfiguration.json",
"new_path": "buildSrc/projectConfiguration.json",
"diff": "{\n\"version\": \"0.4.0\",\n\"stable\": false,\n- \"unstable_version\": 29,\n+ \"unstable_version\": 0,\n\"project_snapshot_name\": \"\",\n\"project_snapshot_version\": 0\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/artifactory/ArtifactoryConfig.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/artifactory/ArtifactoryConfig.kt",
"diff": "@@ -17,7 +17,7 @@ object ArtifactoryConfig {\nconst val GET_FOLDER_INFO = \"$API_URL/storage/$SOURCE_REPO\"\nconst val DEPLOY_URL = \"$ARTIFACTORY_URL/$SOURCE_REPO\"\n- const val ANDROID_STANDARD_GROUP_ID = \"com.example\"\n+ const val ANDROID_STANDARD_GROUP_ID = \"ru.surfstudio.android\"\nval USER_NAME: String = System.getenv(\"surf_maven_username\") ?: EMPTY_STRING\nval PASSWORD: String = System.getenv(\"surf_maven_password\") ?: EMPTY_STRING\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-534 fix group id |
652,314 | 27.08.2019 13:52:29 | -10,800 | 6147d4fcf5a901f7be13691ea97664994e67bda1 | stable rx-extension | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/components.json",
"new_path": "buildSrc/components.json",
"diff": "{\n\"id\": \"rx-extension\",\n\"version\": \"0.4.0\",\n- \"unstable_version\": 1,\n- \"stable\": false,\n+ \"unstable_version\": 0,\n+ \"stable\": true,\n\"dir\": \"rx-extension\",\n\"libs\": [\n{\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-534 stable rx-extension |
652,314 | 29.08.2019 14:33:29 | -10,800 | 774d6f69e8ea8c4486b2e350d5bad2da3a13471a | released all components | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/components.json",
"new_path": "buildSrc/components.json",
"diff": "\"id\": \"analytics\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": false,\n+ \"stable\": true,\n\"dir\": \"analytics\",\n\"libs\": [\n{\n\"id\": \"animations\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": false,\n+ \"stable\": true,\n\"dir\": \"animations\",\n\"libs\": [\n{\n\"id\": \"app-migration\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": false,\n+ \"stable\": true,\n\"dir\": \"app-migration\",\n\"libs\": [\n{\n\"id\": \"broadcast-extension\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": false,\n+ \"stable\": true,\n\"dir\": \"broadcast-extension\",\n\"libs\": [\n{\n\"id\": \"common\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": false,\n+ \"stable\": true,\n\"dir\": \"common\",\n\"libs\": [\n{\n\"id\": \"connection\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": false,\n+ \"stable\": true,\n\"dir\": \"connection\",\n\"libs\": [\n{\n\"id\": \"converter-gson\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": false,\n+ \"stable\": true,\n\"dir\": \"deprecated/converter-gson\",\n\"libs\": [\n{\n\"id\": \"core-app\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": false,\n+ \"stable\": true,\n\"dir\": \"deprecated/core-app\",\n\"libs\": [\n{\n\"id\": \"core-mvi\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": false,\n+ \"stable\": true,\n\"dir\": \"core-mvi\",\n\"libs\": [\n{\n\"id\": \"core-mvp-binding\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": false,\n+ \"stable\": true,\n\"dir\": \"core-mvp-binding\",\n\"libs\": [\n{\n\"id\": \"core-ui\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": false,\n+ \"stable\": true,\n\"dir\": \"core-ui\",\n\"libs\": [\n{\n\"id\": \"custom-view\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": false,\n+ \"stable\": true,\n\"dir\": \"custom-view\",\n\"libs\": [\n{\n\"id\": \"dagger-scope\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": false,\n+ \"stable\": true,\n\"dir\": \"dagger-scope\",\n\"libs\": [\n{\n\"id\": \"datalist\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": false,\n+ \"stable\": true,\n\"dir\": \"datalist\",\n\"libs\": [\n{\n\"id\": \"easyadapter\",\n\"version\": \"1.0.0\",\n\"unstable_version\": 0,\n- \"stable\": false,\n+ \"stable\": true,\n\"dir\": \"easyadapter\",\n\"libs\": [\n{\n\"id\": \"filestorage\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": false,\n+ \"stable\": true,\n\"dir\": \"filestorage\",\n\"libs\": [\n{\n\"id\": \"imageloader\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": false,\n+ \"stable\": true,\n\"dir\": \"imageloader\",\n\"libs\": [\n{\n\"id\": \"location\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": false,\n+ \"stable\": true,\n\"dir\": \"location\",\n\"libs\": [\n{\n\"id\": \"message-controller\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": false,\n+ \"stable\": true,\n\"dir\": \"message-controller\",\n\"libs\": [\n{\n\"id\": \"mvp\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": false,\n+ \"stable\": true,\n\"dir\": \"mvp\",\n\"libs\": [\n{\n\"id\": \"network\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": false,\n+ \"stable\": true,\n\"dir\": \"deprecated/network\",\n\"libs\": [\n{\n\"id\": \"picture-provider\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": false,\n+ \"stable\": true,\n\"dir\": \"picture-provider\",\n\"libs\": [\n{\n\"id\": \"push\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": false,\n+ \"stable\": true,\n\"dir\": \"push\",\n\"libs\": [\n{\n\"id\": \"recycler-extension\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": false,\n+ \"stable\": true,\n\"dir\": \"recycler-extension\",\n\"libs\": [\n{\n\"id\": \"rxbus\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": false,\n+ \"stable\": true,\n\"dir\": \"rxbus\",\n\"libs\": [\n{\n\"id\": \"security\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": false,\n+ \"stable\": true,\n\"dir\": \"security\",\n\"libs\": [\n{\n\"id\": \"shared-pref\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": false,\n+ \"stable\": true,\n\"dir\": \"shared-pref\",\n\"libs\": [\n{\n\"id\": \"standard-dialog\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": false,\n+ \"stable\": true,\n\"dir\": \"standard-dialog\",\n\"libs\": [\n{\n\"id\": \"util-ktx\",\n\"version\": \"0.4.0\",\n\"unstable_version\": 0,\n- \"stable\": false,\n+ \"stable\": true,\n\"dir\": \"util-ktx\",\n\"libs\": [\n{\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-534 released all components |
652,314 | 02.09.2019 12:05:04 | -10,800 | e790cae20e6b902cb46331f695a25e86a14a009b | change pr pipeline | [
{
"change_type": "MODIFY",
"old_path": "ci-internal/JenkinsfilePullRequestJob.groovy",
"new_path": "ci-internal/JenkinsfilePullRequestJob.groovy",
"diff": "@@ -116,8 +116,7 @@ pipeline.initializeBody = {\nCommonUtil.abortDuplicateBuildsWithDescription(script, AbortDuplicateStrategy.ANOTHER, buildDescription)\n}\n-pipeline.stages = [\n- pipeline.stage(PRE_MERGE) {\n+def preMergeStage = pipeline.stage(PRE_MERGE) {\nCommonUtil.safe(script) {\nscript.sh \"git reset --merge\" //revert previous failed merge\n}\n@@ -136,11 +135,13 @@ pipeline.stages = [\n//local merge with destination\nscript.sh \"git merge origin/$destinationBranch --no-ff\"\n- },\n- pipeline.stage(CHECK_CONFIGURATION_IS_NOT_PROJECT_SNAPSHOT){\n+}\n+\n+def checkConfigurationIsNotProjectSnapshotStage = pipeline.stage(CHECK_CONFIGURATION_IS_NOT_PROJECT_SNAPSHOT){\nscript.sh \"./gradlew checkConfigurationIsNotProjectSnapshotTask\"\n- },\n- pipeline.stage(CHECK_STABLE_MODULES_IN_ARTIFACTORY, StageStrategy.UNSTABLE_WHEN_STAGE_ERROR) {\n+}\n+\n+def checkStableModulesInArtifactoryStage = pipeline.stage(CHECK_STABLE_MODULES_IN_ARTIFACTORY, StageStrategy.UNSTABLE_WHEN_STAGE_ERROR) {\nwithArtifactoryCredentials(script) {\nscript.echo \"artifactory user: ${script.env.surf_maven_username}\"\nscript.sh(\"./gradlew checkStableArtifactsExistInArtifactoryTask\")\n@@ -151,7 +152,12 @@ pipeline.stages = [\nscript.sh(\"./gradlew checkStableArtifactsExistInBintrayTask\")\n}\n- },\n+}\n+\n+pipeline.stages = [\n+ preMergeStage,\n+ checkConfigurationIsNotProjectSnapshotStage,\n+ checkStableModulesInArtifactoryStage,\npipeline.stage(CHECK_STABLE_MODULES_NOT_CHANGED, StageStrategy.UNSTABLE_WHEN_STAGE_ERROR) {\nscript.sh(\"./gradlew checkStableComponentsChanged -PrevisionToCompare=${lastDestinationBranchCommitHash}\")\n},\n@@ -257,3 +263,11 @@ def static withBintrayCredentials(script, body) {\nbody()\n}\n}\n+\n+def static isSourceBranchRelease(String sourceBranch) {\n+ return sourceBranch.startsWith(\"release/\")\n+}\n+\n+def static isSourceBranchProjectSnapshot(String sourceBranch) {\n+ return sourceBranch.startsWith(\"project-snapshot/\")\n+}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-655 change pr pipeline |
652,314 | 02.09.2019 12:35:39 | -10,800 | 39994993da8fa9d953660473204e3cbd207293ce | changed stages | [
{
"change_type": "MODIFY",
"old_path": "ci-internal/JenkinsfilePullRequestJob.groovy",
"new_path": "ci-internal/JenkinsfilePullRequestJob.groovy",
"diff": "@@ -116,6 +116,7 @@ pipeline.initializeBody = {\nCommonUtil.abortDuplicateBuildsWithDescription(script, AbortDuplicateStrategy.ANOTHER, buildDescription)\n}\n+//region Stages\ndef preMergeStage = pipeline.stage(PRE_MERGE) {\nCommonUtil.safe(script) {\nscript.sh \"git reset --merge\" //revert previous failed merge\n@@ -137,11 +138,16 @@ def preMergeStage = pipeline.stage(PRE_MERGE) {\nscript.sh \"git merge origin/$destinationBranch --no-ff\"\n}\n-def checkConfigurationIsNotProjectSnapshotStage = pipeline.stage(CHECK_CONFIGURATION_IS_NOT_PROJECT_SNAPSHOT){\n+def checkConfigurationIsNotProjectSnapshotStage = pipeline.stage(\n+ CHECK_CONFIGURATION_IS_NOT_PROJECT_SNAPSHOT\n+) {\nscript.sh \"./gradlew checkConfigurationIsNotProjectSnapshotTask\"\n}\n-def checkStableModulesInArtifactoryStage = pipeline.stage(CHECK_STABLE_MODULES_IN_ARTIFACTORY, StageStrategy.UNSTABLE_WHEN_STAGE_ERROR) {\n+def checkStableModulesInArtifactoryStage = pipeline.stage(\n+ CHECK_STABLE_MODULES_IN_ARTIFACTORY,\n+ StageStrategy.UNSTABLE_WHEN_STAGE_ERROR\n+) {\nwithArtifactoryCredentials(script) {\nscript.echo \"artifactory user: ${script.env.surf_maven_username}\"\nscript.sh(\"./gradlew checkStableArtifactsExistInArtifactoryTask\")\n@@ -151,67 +157,64 @@ def checkStableModulesInArtifactoryStage = pipeline.stage(CHECK_STABLE_MODULES_I\nscript.echo \"bintray user: ${script.env.surf_bintray_username}\"\nscript.sh(\"./gradlew checkStableArtifactsExistInBintrayTask\")\n}\n+}\n+def checkStableModulesNotChangedStage = pipeline.stage(\n+ CHECK_STABLE_MODULES_NOT_CHANGED,\n+ StageStrategy.UNSTABLE_WHEN_STAGE_ERROR\n+) {\n+ script.sh(\"./gradlew checkStableComponentsChanged -PrevisionToCompare=\" +\n+ \"${lastDestinationBranchCommitHash}\")\n}\n-pipeline.stages = [\n- preMergeStage,\n- checkConfigurationIsNotProjectSnapshotStage,\n- checkStableModulesInArtifactoryStage,\n- pipeline.stage(CHECK_STABLE_MODULES_NOT_CHANGED, StageStrategy.UNSTABLE_WHEN_STAGE_ERROR) {\n- script.sh(\"./gradlew checkStableComponentsChanged -PrevisionToCompare=${lastDestinationBranchCommitHash}\")\n- },\n- pipeline.stage(CHECK_UNSTABLE_MODULES_DO_NOT_BECAME_STABLE, StageStrategy.UNSTABLE_WHEN_STAGE_ERROR) {\n- script.sh(\"./gradlew checkUnstableToStableChanged -PrevisionToCompare=${lastDestinationBranchCommitHash}\")\n- },\n- pipeline.stage(CHECK_MODULES_IN_DEPENDENCY_TREE_OF_STABLE_MODULE_ALSO_STABLE, StageStrategy.UNSTABLE_WHEN_STAGE_ERROR) {\n+def checkModulesInDependencyTreeOfStableModuleAlsoStableStage = pipeline.stage(\n+ CHECK_MODULES_IN_DEPENDENCY_TREE_OF_STABLE_MODULE_ALSO_STABLE,\n+ StageStrategy.UNSTABLE_WHEN_STAGE_ERROR\n+) {\nscript.sh(\"./gradlew checkStableComponentStandardDependenciesStableTask\")\n- },\n- pipeline.stage(CHECK_RELEASE_NOTES_VALID, StageStrategy.UNSTABLE_WHEN_STAGE_ERROR) {\n+}\n+\n+def checkUnstableModulesDoNotBecameStableStage = pipeline.stage(\n+ CHECK_UNSTABLE_MODULES_DO_NOT_BECAME_STABLE,\n+ StageStrategy.UNSTABLE_WHEN_STAGE_ERROR\n+) {\n+ script.sh(\"./gradlew checkUnstableToStableChanged -PrevisionToCompare=\" +\n+ \"${lastDestinationBranchCommitHash}\")\n+}\n+\n+def checkReleaseNotChangedStage = pipeline.stage(\n+ CHECK_RELEASE_NOTES_VALID,\n+ StageStrategy.UNSTABLE_WHEN_STAGE_ERROR\n+) {\nscript.sh(\"./gradlew checkReleaseNotesContainCurrentVersion\")\n- },\n- pipeline.stage(CHECK_RELEASE_NOTES_CHANGED, StageStrategy.UNSTABLE_WHEN_STAGE_ERROR) {\n+}\n+\n+def checkReleaseNotesChangedStage = pipeline.stage(\n+ CHECK_RELEASE_NOTES_CHANGED,\n+ StageStrategy.UNSTABLE_WHEN_STAGE_ERROR\n+) {\nscript.sh(\"./gradlew checkReleaseNotesChanged -PrevisionToCompare=${lastDestinationBranchCommitHash}\")\n- },\n- pipeline.stage(CHECKS_BUILD_TEMPLATE, StageStrategy.UNSTABLE_WHEN_STAGE_ERROR) {\n+}\n+\n+def checkBuildTemplateStage = pipeline.stage(CHECKS_BUILD_TEMPLATE, StageStrategy.UNSTABLE_WHEN_STAGE_ERROR) {\nscript.sh(\"./gradlew generateModulesNamesFile\")\nscript.sh(\"echo \\\"androidStandardDebugDir=$workspace\\n\" +\n\"androidStandardDebugMode=true\\\" > template/android-standard/androidStandard.properties\")\nscript.sh(\"./gradlew -p template clean build assembleQa --stacktrace\")\n- },\n- pipeline.stage(CHECKS_RESULT) {\n- def checksPassed = true\n- [\n- CHECK_STABLE_MODULES_IN_ARTIFACTORY,\n- CHECK_STABLE_MODULES_NOT_CHANGED,\n- CHECK_UNSTABLE_MODULES_DO_NOT_BECAME_STABLE,\n- CHECK_MODULES_IN_DEPENDENCY_TREE_OF_STABLE_MODULE_ALSO_STABLE,\n- CHECK_RELEASE_NOTES_VALID,\n- CHECK_RELEASE_NOTES_CHANGED,\n- CHECKS_BUILD_TEMPLATE\n- ].each { stageName ->\n- def stageResult = pipeline.getStage(stageName).result\n- checksPassed = checksPassed && (stageResult == Result.SUCCESS || stageResult == Result.NOT_BUILT)\n- if (!checksPassed) {\n- script.echo \"stageName = ${stageName}, checksPassed = ${checksPassed}, stageResult = ${stageResult}\"\n- }\n}\n- if (!checksPassed) {\n- script.error(\"Checks Failed\")\n+def buildStage = pipeline.stage(BUILD) {\n+ AndroidPipelineHelper.buildStageBodyAndroid(script, \"clean assemble\")\n}\n- },\n- pipeline.stage(BUILD) {\n- AndroidPipelineHelper.buildStageBodyAndroid(script, \"clean assemble\")\n- },\n- pipeline.stage(UNIT_TEST) {\n+def unitTestStage = pipeline.stage(UNIT_TEST) {\nAndroidPipelineHelper.unitTestStageBodyAndroid(script,\n\"testReleaseUnitTest\",\n\"**/test-results/testReleaseUnitTest/*.xml\",\n\"app/build/reports/tests/testReleaseUnitTest/\")\n- },\n- pipeline.stage(INSTRUMENTATION_TEST) {\n+}\n+\n+def instrumentationTestStage = pipeline.stage(INSTRUMENTATION_TEST) {\nAndroidPipelineHelper.instrumentationTestStageBodyAndroid(\nscript,\nnew AvdConfig(),\n@@ -225,11 +228,90 @@ pipeline.stages = [\n0\n)\n)\n- },\n- pipeline.stage(STATIC_CODE_ANALYSIS, StageStrategy.SKIP_STAGE) {\n+}\n+\n+def staticCodeAnalysisStage = pipeline.stage(STATIC_CODE_ANALYSIS, StageStrategy.SKIP_STAGE) {\nAndroidPipelineHelper.staticCodeAnalysisStageBody(script)\n}\n+//endregion\n+\n+if(isSourceBranchProjectSnapshot(sourceBranch)){\n+ pipeline.stages = [\n+ preMergeStage,\n+ buildStage,\n+ unitTestStage\n+ ]\n+} else if (isSourceBranchRelease(sourceBranch)){\n+ pipeline.stages = [\n+ preMergeStage,\n+ checkConfigurationIsNotProjectSnapshotStage,\n+ checkStableModulesInArtifactoryStage,\n+ checkModulesInDependencyTreeOfStableModuleAlsoStableStage,\n+ checkReleaseNotChangedStage,\n+ checkBuildTemplateStage,\n+ pipeline.stage(CHECKS_RESULT) {\n+ def checksPassed = true\n+ [\n+ CHECK_STABLE_MODULES_IN_ARTIFACTORY,\n+ CHECK_MODULES_IN_DEPENDENCY_TREE_OF_STABLE_MODULE_ALSO_STABLE,\n+ CHECK_RELEASE_NOTES_VALID,\n+ CHECKS_BUILD_TEMPLATE\n+ ].each { stageName ->\n+ def stageResult = pipeline.getStage(stageName).result\n+ checksPassed = checksPassed && (stageResult == Result.SUCCESS || stageResult == Result.NOT_BUILT)\n+ if (!checksPassed) {\n+ script.echo \"stageName = ${stageName}, checksPassed = ${checksPassed}, stageResult = ${stageResult}\"\n+ }\n+ }\n+\n+ if (!checksPassed) {\n+ script.error(\"Checks Failed\")\n+ }\n+ },\n+ buildStage,\n+ unitTestStage,\n+ instrumentationTestStage,\n+ staticCodeAnalysisStage\n+ ]\n+}else{\n+ pipeline.stages = [\n+ preMergeStage,\n+ checkConfigurationIsNotProjectSnapshotStage,\n+ checkStableModulesInArtifactoryStage,\n+ checkStableModulesNotChangedStage,\n+ checkUnstableModulesDoNotBecameStableStage,\n+ checkModulesInDependencyTreeOfStableModuleAlsoStableStage,\n+ checkReleaseNotChangedStage,\n+ checkReleaseNotesChangedStage,\n+ checkBuildTemplateStage,\n+ pipeline.stage(CHECKS_RESULT) {\n+ def checksPassed = true\n+ [\n+ CHECK_STABLE_MODULES_IN_ARTIFACTORY,\n+ CHECK_STABLE_MODULES_NOT_CHANGED,\n+ CHECK_UNSTABLE_MODULES_DO_NOT_BECAME_STABLE,\n+ CHECK_MODULES_IN_DEPENDENCY_TREE_OF_STABLE_MODULE_ALSO_STABLE,\n+ CHECK_RELEASE_NOTES_VALID,\n+ CHECK_RELEASE_NOTES_CHANGED,\n+ CHECKS_BUILD_TEMPLATE\n+ ].each { stageName ->\n+ def stageResult = pipeline.getStage(stageName).result\n+ checksPassed = checksPassed && (stageResult == Result.SUCCESS || stageResult == Result.NOT_BUILT)\n+ if (!checksPassed) {\n+ script.echo \"stageName = ${stageName}, checksPassed = ${checksPassed}, stageResult = ${stageResult}\"\n+ }\n+ }\n+\n+ if (!checksPassed) {\n+ script.error(\"Checks Failed\")\n+ }\n+ },\n+ buildStage,\n+ unitTestStage,\n+ instrumentationTestStage,\n+ staticCodeAnalysisStage\n]\n+}\npipeline.finalizeBody = {\nif (pipeline.jobResult != Result.SUCCESS && pipeline.jobResult != Result.ABORTED) {\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-655 changed stages |
652,314 | 04.09.2019 10:46:50 | -10,800 | ef1e20d30d176366f3c3789f3c4a3db33e27565a | fix implement version-plugin in template | [
{
"change_type": "MODIFY",
"old_path": "template/android-standard/androidStandardConfig.gradle",
"new_path": "template/android-standard/androidStandardConfig.gradle",
"diff": "@@ -49,7 +49,6 @@ gradle.ext {\n*/\nandroidStandard.api = {\ncontext,\n- androidStandardVersion,\nmodules,\nclosure = null,\nsourceType = ModuleSourceType.SETTINGS_DEFINED.toString() ->\n@@ -69,11 +68,12 @@ gradle.ext {\n}\ncontext.dependencies {\n- modules.each {\n+ modules.each { artifactName ->\n+ def version = context.androidStandard.version(artifactName)\nif (closure == null) {\n- api \"ru.surfstudio.android:$it:$surfCoreVersionName\"\n+ api(\"ru.surfstudio.android:$artifactName:$version\")\n} else {\n- api(\"ru.surfstudio.android:$it:$surfCoreVersionName\", closure)\n+ api(\"ru.surfstudio.android:$artifactName:$version\", closure)\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "template/base/build.gradle",
"new_path": "template/base/build.gradle",
"diff": "+apply plugin: 'ru.surfstudio.android'\n+\napply from: '../commonModule.gradle'\ndependencies {\n@@ -5,7 +7,6 @@ dependencies {\ngradle.ext.androidStandard.api(\nthis,\n- \"$surfCoreVersionName\",\n[\n\"activity-holder\",\n\"core-ui\",\n"
},
{
"change_type": "MODIFY",
"old_path": "template/f-debug-no-op/build.gradle",
"new_path": "template/f-debug-no-op/build.gradle",
"diff": "apply from: '../commonModule.gradle'\n+apply plugin: 'ru.surfstudio.android'\n+\ndependencies {\ngradle.ext.androidStandard.api(\nthis,\n- \"$surfCoreVersionName\",\n[\n\"activity-holder\",\n\"core-ui\",\n@@ -33,9 +34,7 @@ dependencies {\n\"standard-dialog\",\n\"message-controller\",\n\"broadcast-extension\",\n- \"rxbus\"],\n- null, //todo remove for real app\n- \"LOCAL\" //todo remove for real app\n+ \"rxbus\"]\n)\nimplementation \"com.squareup.retrofit2:retrofit:$retrofitVersion\"\n"
},
{
"change_type": "MODIFY",
"old_path": "template/f-debug/build.gradle",
"new_path": "template/f-debug/build.gradle",
"diff": "apply from: '../commonModule.gradle'\n+\napply plugin: 'kotlin-kapt'\n+apply plugin: 'ru.surfstudio.android'\ndependencies {\nimplementation project(\"$templatePrefix:base\")\n@@ -34,7 +36,6 @@ dependencies {\ngradle.ext.androidStandard.api(\nthis,\n- \"$surfCoreVersionName\",\n[\n\"activity-holder\",\n\"core-ui\",\n@@ -64,8 +65,7 @@ dependencies {\n\"standard-dialog\",\n\"message-controller\",\n\"broadcast-extension\",\n- \"rxbus\"],\n- null, //todo remove for real app\n- \"LOCAL\" //todo remove for real app\n+ \"rxbus\"\n+ ]\n)\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-654 fix implement version-plugin in template |
652,322 | 04.09.2019 13:38:10 | -10,800 | ccafe689dc75c59517badd1d002286d223fa0a99 | downgrade unstable version | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/components.json",
"new_path": "buildSrc/components.json",
"diff": "{\n\"id\": \"activity-holder\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"activity-holder\",\n\"libs\": [\n{\n\"id\": \"analytics\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 3,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"analytics\",\n\"libs\": [\n{\n\"id\": \"animations\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"animations\",\n\"libs\": [\n{\n\"id\": \"app-migration\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"app-migration\",\n\"libs\": [\n{\n\"id\": \"broadcast-extension\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"broadcast-extension\",\n\"libs\": [\n{\n\"id\": \"common\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"common\",\n\"libs\": [\n{\n\"id\": \"connection\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"connection\",\n\"libs\": [\n{\n\"id\": \"converter-gson\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"deprecated/converter-gson\",\n\"libs\": [\n{\n\"id\": \"core-app\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 3,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"deprecated/core-app\",\n\"libs\": [\n{\n\"id\": \"core-mvi\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"core-mvi\",\n\"libs\": [\n{\n\"id\": \"core-mvp-binding\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 3,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"core-mvp-binding\",\n\"libs\": [\n{\n\"id\": \"core-ui\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 3,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"core-ui\",\n\"libs\": [\n{\n\"id\": \"custom-view\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"custom-view\",\n\"libs\": [\n{\n\"id\": \"dagger-scope\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"dagger-scope\",\n\"libs\": [\n{\n\"id\": \"datalist\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 3,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"datalist\",\n\"libs\": [\n{\n\"id\": \"easyadapter\",\n\"version\": \"1.0.0\",\n- \"unstable_version\": 3,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"easyadapter\",\n\"libs\": [\n{\n\"id\": \"filestorage\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"filestorage\",\n\"libs\": [\n{\n\"id\": \"imageloader\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"imageloader\",\n\"libs\": [\n{\n\"id\": \"location\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 3,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"location\",\n\"libs\": [\n{\n\"id\": \"logger\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"logger\",\n\"libs\": [\n{\n\"id\": \"message-controller\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"message-controller\",\n\"libs\": [\n{\n\"id\": \"mvp\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 3,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"mvp\",\n\"libs\": [\n{\n\"id\": \"network\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 3,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"deprecated/network\",\n\"libs\": [\n{\n\"id\": \"picture-provider\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"picture-provider\",\n\"libs\": [\n{\n\"id\": \"push\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"push\",\n\"libs\": [\n{\n\"id\": \"recycler-extension\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 3,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"recycler-extension\",\n\"libs\": [\n{\n\"id\": \"rx-extension\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 3,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"rx-extension\",\n\"libs\": [\n{\n\"id\": \"rxbus\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"rxbus\",\n\"libs\": [\n{\n\"id\": \"security\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"security\",\n\"libs\": [\n{\n\"id\": \"shared-pref\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 3,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"shared-pref\",\n\"libs\": [\n{\n\"id\": \"standard-dialog\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"standard-dialog\",\n\"libs\": [\n{\n\"id\": \"util-ktx\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 0,\n\"stable\": false,\n\"dir\": \"util-ktx\",\n\"libs\": [\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | downgrade unstable version |
652,314 | 05.09.2019 15:28:58 | -10,800 | 2a47202edba4f55245677a381fcb9094abc53e16 | added skipping stages for different branches | [
{
"change_type": "MODIFY",
"old_path": "ci-internal/JenkinsfilePullRequestJob.groovy",
"new_path": "ci-internal/JenkinsfilePullRequestJob.groovy",
"diff": "@@ -81,8 +81,6 @@ def getTestInstrumentationRunnerName = { script, prefix ->\ndef script = this\ndef pipeline = new EmptyScmPipeline(script)\n-def hasChanges = false\n-\npipeline.init()\n//configuration\n@@ -292,21 +290,16 @@ def configureStageSkipping(script, pipeline, isSkip, stageNames, message){\nif (isSkip) {\nscript.echo message\npipeline.stages.each { stage ->\n- script.echo \"stage = $stage\"\n- script.echo \"stage name = ${stage.getName()}\"\nif (!(stage instanceof SimpleStage)) {\nreturn\n}\ndef executeStage = false\nstageNames.each{ stageName ->\n- println \"stageName ${stageName} ${stageName == stage.getName()}\"\nexecuteStage = executeStage || (stageName == stage.getName())\n}\nif (!executeStage) {\nstage.strategy = StageStrategy.SKIP_STAGE\n}\n-\n- println \"Result ${stage.strategy}\"\n}\n}\n}\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-655 added skipping stages for different branches |
652,316 | 06.09.2019 13:45:41 | -10,800 | bedf4da5b719500e7cf84661bbfad280f6042b3b | Add simple diff generation for release notes files | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/buildTasks.gradle",
"new_path": "buildSrc/buildTasks.gradle",
"diff": "@@ -3,6 +3,7 @@ import ru.surfstudio.android.build.tasks.*\nimport ru.surfstudio.android.build.tasks.check_stable_artifacts_exist_in_repositories.*\nimport ru.surfstudio.android.build.tasks.check_dependencies_stable.*\nimport ru.surfstudio.android.build.tasks.deploy_to_mirror.*\n+import ru.surfstudio.android.build.tasks.generate_release_notes_diff.*\ntask checkStandardDependenciesStableTask(type: CheckStandardDependenciesStableTask) //release\n@@ -76,6 +77,8 @@ task checkConfigurationIsNotProjectSnapshotTask(type: CheckConfigurationIsNotPro\ntask distributeArtifactsToBintrayTask(type: DistributeArtifactsToBintrayTask) // release\n+task generateReleaseNotesDiff(type: GenerateReleaseNotesDiffTask) // helper\n+\ntask uploadArchiveComponentsTask(type: UploadArchiveComponentsTask){\nComponents.libraries.each {\nif(it.artifactName != \"\") {\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/GradleProperties.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/GradleProperties.kt",
"diff": "@@ -36,6 +36,11 @@ object GradleProperties {\n*/\nconst val COMPONENTS_CHANGED_REVISION_TO_COMPARE = \"revisionToCompare\"\n+ /**\n+ * Current revision to compare with previous\n+ */\n+ const val CURRENT_REVISION = \"currentRevision\"\n+\n/**\n* If artifact exist in artifactory replace it\n*/\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/ReleaseNotes.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/ReleaseNotes.kt",
"diff": "@@ -4,6 +4,7 @@ import ru.surfstudio.android.build.exceptions.release_notes.ReleaseNotesFileNotE\nimport ru.surfstudio.android.build.exceptions.release_notes.ReleaseNotesFormatException\nimport ru.surfstudio.android.build.exceptions.release_notes.ReleaseNotesNotFoundException\nimport ru.surfstudio.android.build.exceptions.release_notes.ReleaseNotesParsingException\n+import ru.surfstudio.android.build.model.Component\nimport ru.surfstudio.android.build.model.release_notes.ReleaseNotesInfo\nimport java.io.BufferedReader\nimport java.io.File\n@@ -25,12 +26,15 @@ object ReleaseNotes {\n?: throw ReleaseNotesNotFoundException(componentName)\n}\n+ fun getReleaseNotesFilePath(component: Component): String =\n+ \"${component.directory}/$RELEASE_NOTES_FILE_NAME\"\n+\n/**\n* Parse releaseNotes.md files\n*/\nprivate fun parseReleaseNotesFiles(): List<ReleaseNotesInfo> {\nreturn Components.value.map { component ->\n- val file = File(\"${component.directory}/$RELEASE_NOTES_FILE_NAME\")\n+ val file = File(getReleaseNotesFilePath(component))\ncheckReleaseNotesFilesExist(file)\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/changed_components/GitCommandRunner.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/changed_components/GitCommandRunner.kt",
"diff": "@@ -5,6 +5,7 @@ import ru.surfstudio.android.build.tasks.currentDirectory\nimport java.io.File\nconst val GIT_DIFF_COMMAND = \"git diff --name-only\"\n+const val GIT_FULL_DIFF_COMMAND = \"git diff\"\nconst val GIT_CHECKOUT_COMMAND = \"git checkout\"\nconst val GIT_STASH_COMMAND = \"git stash\"\nconst val GIT_GET_CURRENT_REVISION_COMMAND = \"git rev-parse --short HEAD\"\n@@ -17,6 +18,13 @@ class GitCommandRunner(\nprivate val directory: String = currentDirectory\n) {\n+ /**\n+ * Get file names with changes between current revision and revision stated in parameters\n+ *\n+ * @param rev prior revision\n+ *\n+ * @return List of file names\n+ */\nfun diff(rev: String): List<String>? {\nval command = \"$GIT_DIFF_COMMAND $rev\"\nval res = runCommandWithResult(command, File(directory))\n@@ -24,6 +32,30 @@ class GitCommandRunner(\nreturn res?.trim()?.split(SPLIT_STRING.toRegex())\n}\n+ /**\n+ * Show full diff between two commits as a string\n+ *\n+ * @param currentRevision commit, which is used as a head to this diff\n+ * @param previousRevision commit, which is prior to current\n+ * @param filePath path to file or directory to see a diff\n+ * @param opts formatting options, default - show only diff, without original text\n+ *\n+ * @return String with git diff\n+ */\n+ fun getFullDiff(\n+ currentRevision: String,\n+ previousRevision: String,\n+ filePath: String,\n+ opts: String = \"-U0\"\n+ ): String? {\n+ val command = if (previousRevision.isEmpty()) {\n+ \"$GIT_FULL_DIFF_COMMAND $opts $currentRevision $filePath\"\n+ } else {\n+ \"$GIT_FULL_DIFF_COMMAND $opts $previousRevision $currentRevision $filePath\"\n+ }\n+ return runCommandWithResult(command, File(directory))\n+ }\n+\nfun checkoutRevision(revision: String) {\nrunCommandWithResult(GIT_STASH_COMMAND, File(directory))\nval command = \"$GIT_CHECKOUT_COMMAND $revision\"\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/generate_release_notes_diff/GenerateReleaseNotesDiffTask.kt",
"diff": "+package ru.surfstudio.android.build.tasks.generate_release_notes_diff\n+\n+import org.gradle.api.DefaultTask\n+import org.gradle.api.tasks.TaskAction\n+import org.gradle.internal.logging.text.StyledTextOutput\n+import org.gradle.internal.logging.text.StyledTextOutputFactory\n+import ru.surfstudio.android.build.Components\n+import ru.surfstudio.android.build.GradleProperties\n+import ru.surfstudio.android.build.ReleaseNotes\n+import ru.surfstudio.android.build.model.Component\n+import ru.surfstudio.android.build.tasks.changed_components.GitCommandRunner\n+import ru.surfstudio.android.build.utils.EMPTY_STRING\n+import java.lang.RuntimeException\n+\n+/**\n+ * Task to see the differences between two revisions of RELEASE_NOTES.md in each module of a project\n+ */\n+open class GenerateReleaseNotesDiffTask : DefaultTask() {\n+\n+ private lateinit var componentName: String\n+ private lateinit var revisionToCompare: String\n+ private lateinit var currentRevision: String\n+\n+ private val gitRunner: GitCommandRunner = GitCommandRunner()\n+\n+ private val outputStyler = services.get(StyledTextOutputFactory::class.java).create(\"styled output\")\n+\n+ @TaskAction\n+ fun generate() {\n+ extractInputArguments()\n+ if (componentName.isNotEmpty()) {\n+ val component = Components.value.find { it.name == componentName }\n+ ?: throw RuntimeException(\"Component cant be found\")\n+ generateComponentDiff(component)\n+ } else {\n+ Components.value.forEach(::generateComponentDiff)\n+ }\n+ }\n+\n+ private fun generateComponentDiff(component: Component) {\n+ val rawDiff = extractRawDiff(component)\n+ val diffs = parseRawDiff(rawDiff)\n+ if (diffs.isNotEmpty()) printComponentName(component)\n+ printDiff(diffs)\n+ if (diffs.isNotEmpty()) println()\n+ }\n+\n+ private fun printComponentName(component: Component) {\n+ outputStyler.style(StyledTextOutput.Style.Header).println(component.name)\n+ }\n+\n+ private fun parseRawDiff(diff: String): List<GitDiff> =\n+ SimpleGitDiffParser.parse(diff)\n+\n+ private fun extractRawDiff(component: Component): String {\n+ val filePath = ReleaseNotes.getReleaseNotesFilePath(component)\n+ return gitRunner.getFullDiff(currentRevision, revisionToCompare, filePath) ?: \"\"\n+ }\n+\n+ private fun printDiff(diffs: List<GitDiff>) {\n+ diffs.forEachIndexed { index, diff ->\n+ addSpaceBetweenChanges(index, diff.type)\n+ val style = getStyleFromDiffType(diff.type)\n+ outputStyler.style(style).println(diff.line)\n+ }\n+ }\n+\n+ private fun addSpaceBetweenChanges(index: Int, type: GitDiff.Type) {\n+ if (index != 0 && type == GitDiff.Type.SEPARATE) {\n+ println()\n+ }\n+ }\n+\n+ private fun getStyleFromDiffType(type: GitDiff.Type): StyledTextOutput.Style = when (type) {\n+ GitDiff.Type.ADD -> StyledTextOutput.Style.Success\n+ GitDiff.Type.REMOVE -> StyledTextOutput.Style.Failure\n+ GitDiff.Type.SEPARATE -> StyledTextOutput.Style.Normal\n+ }\n+\n+ private fun extractInputArguments() {\n+ componentName = if (!project.hasProperty(GradleProperties.COMPONENT)) {\n+ EMPTY_STRING\n+ } else {\n+ project.findProperty(GradleProperties.COMPONENT) as String\n+ }\n+\n+ revisionToCompare = if (!project.hasProperty(GradleProperties.COMPONENTS_CHANGED_REVISION_TO_COMPARE)) {\n+ EMPTY_STRING\n+ } else {\n+ project.findProperty(GradleProperties.COMPONENTS_CHANGED_REVISION_TO_COMPARE) as String\n+ }\n+\n+ currentRevision = if (project.hasProperty(GradleProperties.CURRENT_REVISION)) {\n+ project.findProperty(GradleProperties.CURRENT_REVISION) as String\n+ } else {\n+ gitRunner.getCurrentRevisionShort()\n+ }\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/generate_release_notes_diff/GitDiff.kt",
"diff": "+package ru.surfstudio.android.build.tasks.generate_release_notes_diff\n+\n+/**\n+ * Simple git diff model. Contains information about single line differences.\n+ *\n+ * @param line text of the line, which is affected by diff\n+ * @param type type of git difference\n+ */\n+data class GitDiff(\n+ val line: String,\n+ val type: Type\n+) {\n+\n+ /**\n+ * Git diff type for a single line\n+ *\n+ * @property ADD the line was added\n+ * @property REMOVE the line was removed\n+ * @property SEPARATE the line is used to separate two diff blocks\n+ *\n+ */\n+ enum class Type {\n+ ADD,\n+ REMOVE,\n+ SEPARATE\n+ }\n+}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-633 Add simple diff generation for release notes files |
652,316 | 06.09.2019 16:16:35 | -10,800 | bed29c6913fee6f1d6f59dad3f13858b58b22baf | Add diff generation git stage | [
{
"change_type": "MODIFY",
"old_path": "ci-internal/JenkinsfilePullRequestJob.groovy",
"new_path": "ci-internal/JenkinsfilePullRequestJob.groovy",
"diff": "-@Library('surf-lib@version-2.0.0-SNAPSHOT') // https://bitbucket.org/surfstudio/jenkins-pipeline-lib/\n+@Library('surf-lib@version-2.0.0-SNAPSHOT')\n+// https://bitbucket.org/surfstudio/jenkins-pipeline-lib/\nimport ru.surfstudio.ci.*\nimport ru.surfstudio.ci.pipeline.empty.EmptyScmPipeline\n@@ -25,6 +26,7 @@ def CHECK_RELEASE_NOTES_VALID = 'Check Release Notes Valid'\ndef CHECK_RELEASE_NOTES_CHANGED = 'Check Release Notes Changed'\ndef CHECKS_RESULT = 'Checks Result'\ndef CHECKS_BUILD_TEMPLATE = 'Checks Build Template'\n+def GENERATE_RELEASE_NOTES_DIFF = 'Generates diffs in release notes'\ndef BUILD = 'Build'\ndef UNIT_TEST = 'Unit Test'\n@@ -137,6 +139,11 @@ pipeline.stages = [\n//local merge with destination\nscript.sh \"git merge origin/$destinationBranch --no-ff\"\n},\n+\n+ pipeline.stage(GENERATE_RELEASE_NOTES_DIFF, StageStrategy.UNSTABLE_WHEN_STAGE_ERROR) {\n+ script.sh(\"./gradlew generateReleaseNotesDiff -PrevisionToCompare=${lastDestinationBranchCommitHash}\")\n+ },\n+\npipeline.stage(CHECK_CONFIGURATION_IS_NOT_PROJECT_SNAPSHOT) {\nscript.sh \"./gradlew checkConfigurationIsNotProjectSnapshotTask\"\n},\n"
},
{
"change_type": "MODIFY",
"old_path": "core-mvi/RELEASE_NOTES.md",
"new_path": "core-mvi/RELEASE_NOTES.md",
"diff": "# Core-mvi Release Notes\n## 0.5.0-alpha.0\n##### Core-mvi\n-* TODO\n\\ No newline at end of file\n+* Core MVI Refactor was done\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-690 Add diff generation git stage |
652,316 | 06.09.2019 16:25:31 | -10,800 | 59f00cd82a3601da3bfcd0179ba0027fb879db73 | Edit jenkins stage | [
{
"change_type": "MODIFY",
"old_path": "ci-internal/JenkinsfilePullRequestJob.groovy",
"new_path": "ci-internal/JenkinsfilePullRequestJob.groovy",
"diff": "@@ -54,6 +54,7 @@ def stagesForProjectMode = [\n]\ndef stagesForReleaseMode = [\nPRE_MERGE,\n+ GENERATE_RELEASE_NOTES_DIFF,\nCHECK_CONFIGURATION_IS_NOT_PROJECT_SNAPSHOT,\nCHECK_STABLE_MODULES_IN_ARTIFACTORY,\nCHECK_MODULES_IN_DEPENDENCY_TREE_OF_STABLE_MODULE_ALSO_STABLE,\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-690 Edit jenkins stage |
652,322 | 06.09.2019 16:44:47 | -10,800 | 269f27fd987df6d63ead86729ff59c6b577f4888 | fix CheckReleaseNotesChangedTask | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/changed_components/ComponentsDiffProvider.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/changed_components/ComponentsDiffProvider.kt",
"diff": "@@ -64,6 +64,5 @@ class ComponentsDiffProvider(\nprivate fun isDiffHasComponent(diffResult: String, component: Component): Boolean {\nreturn diffResult.startsWith(component.directory)\n- && !diffResult.endsWith(\"RELEASE_NOTES.md\")\n}\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | fix CheckReleaseNotesChangedTask |
652,316 | 06.09.2019 19:18:41 | -10,800 | 15fc78eb50b57e9d17e4af19b0083ab73c556556 | Add line highlight logic + non coloring add/remove support | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/generate_release_notes_diff/GenerateReleaseNotesDiffTask.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/generate_release_notes_diff/GenerateReleaseNotesDiffTask.kt",
"diff": "@@ -7,10 +7,10 @@ import org.gradle.internal.logging.text.StyledTextOutputFactory\nimport ru.surfstudio.android.build.Components\nimport ru.surfstudio.android.build.GradleProperties\nimport ru.surfstudio.android.build.ReleaseNotes\n+import ru.surfstudio.android.build.exceptions.ComponentNotFoundException\nimport ru.surfstudio.android.build.model.Component\nimport ru.surfstudio.android.build.tasks.changed_components.GitCommandRunner\nimport ru.surfstudio.android.build.utils.EMPTY_STRING\n-import java.lang.RuntimeException\n/**\n* Task to see the differences between two revisions of RELEASE_NOTES.md in each module of a project\n@@ -29,14 +29,17 @@ open class GenerateReleaseNotesDiffTask : DefaultTask() {\nfun generate() {\nextractInputArguments()\nif (componentName.isNotEmpty()) {\n- val component = Components.value.find { it.name == componentName }\n- ?: throw RuntimeException(\"Component cant be found\")\n+ val component = findComponent()\ngenerateComponentDiff(component)\n} else {\nComponents.value.forEach(::generateComponentDiff)\n}\n}\n+ private fun findComponent(): Component =\n+ Components.value.find { it.name == componentName }\n+ ?: throw ComponentNotFoundException(componentName)\n+\nprivate fun generateComponentDiff(component: Component) {\nval rawDiff = extractRawDiff(component)\nval diffs = parseRawDiff(rawDiff)\n@@ -58,17 +61,47 @@ open class GenerateReleaseNotesDiffTask : DefaultTask() {\n}\nprivate fun printDiff(diffs: List<GitDiff>) {\n- diffs.forEachIndexed { index, diff ->\n- addSpaceBetweenChanges(index, diff.type)\n- val style = getStyleFromDiffType(diff.type)\n- outputStyler.style(style).println(diff.line)\n+ var currentChangeLineNumber = 0\n+ var currentChangeLinesCount = 0\n+ var addsCount = 0\n+ var removesCount = 0\n+ var prev: GitDiff? = null\n+ diffs.forEach { diff ->\n+\n+ currentChangeLinesCount++\n+\n+ if (diff.type == GitDiff.Type.ADD) addsCount++\n+ if (diff.type == GitDiff.Type.REMOVE) removesCount++\n+\n+ if (diff.type == GitDiff.Type.SEPARATE) {\n+ currentChangeLineNumber = diff.line.toInt() + addsCount - removesCount\n+ }\n+\n+ if (prev?.type != diff.type) {\n+ currentChangeLinesCount = 0\n+ }\n+\n+ val currentChangeLine = currentChangeLineNumber + currentChangeLinesCount\n+\n+ printLine(currentChangeLine, diff, prev)\n+\n+ prev = diff\n}\n}\n- private fun addSpaceBetweenChanges(index: Int, type: GitDiff.Type) {\n- if (index != 0 && type == GitDiff.Type.SEPARATE) {\n- println()\n+ /**\n+ * Prints styled line from git diff\n+ */\n+ private fun printLine(currentLine: Int, diff: GitDiff, prev: GitDiff?) {\n+ val style = getStyleFromDiffType(diff.type)\n+ val spaceString = getSpaces(currentLine)\n+ val lineToPrint = when {\n+ prev == null -> return\n+ diff.type == GitDiff.Type.SEPARATE -> \"...\"\n+ else -> \"$currentLine$spaceString${diff.line}\"\n+\n}\n+ outputStyler.style(style).println(lineToPrint)\n}\nprivate fun getStyleFromDiffType(type: GitDiff.Type): StyledTextOutput.Style = when (type) {\n@@ -77,6 +110,19 @@ open class GenerateReleaseNotesDiffTask : DefaultTask() {\nGitDiff.Type.SEPARATE -> StyledTextOutput.Style.Normal\n}\n+ /**\n+ * Simple tabulation method which adds spaces according to line length\n+ */\n+ private fun getSpaces(currentLine: Int): String {\n+ val space = \" \"\n+ val spacesCount = when {\n+ currentLine / 10 == 0 -> 3\n+ currentLine / 100 == 0 -> 2\n+ else -> 1\n+ }\n+ return space.repeat(spacesCount)\n+ }\n+\nprivate fun extractInputArguments() {\ncomponentName = if (!project.hasProperty(GradleProperties.COMPONENT)) {\nEMPTY_STRING\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-690 Add line highlight logic + non coloring add/remove support |
652,316 | 09.09.2019 11:27:01 | -10,800 | 95eb6b013cc6da8f0dfad20c641796045bbb0ad8 | Small parser refactor | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/generate_release_notes_diff/GenerateReleaseNotesDiffTask.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/generate_release_notes_diff/GenerateReleaseNotesDiffTask.kt",
"diff": "@@ -53,7 +53,7 @@ open class GenerateReleaseNotesDiffTask : DefaultTask() {\n}\nprivate fun parseRawDiff(diff: String): List<GitDiff> =\n- SimpleGitDiffParser.parse(diff)\n+ SimpleGitDiffParser().parse(diff)\nprivate fun extractRawDiff(component: Component): String {\nval filePath = ReleaseNotes.getReleaseNotesFilePath(component)\n@@ -61,30 +61,9 @@ open class GenerateReleaseNotesDiffTask : DefaultTask() {\n}\nprivate fun printDiff(diffs: List<GitDiff>) {\n- var currentChangeLineNumber = 0\n- var currentChangeLinesCount = 0\n- var addsCount = 0\n- var removesCount = 0\nvar prev: GitDiff? = null\ndiffs.forEach { diff ->\n-\n- currentChangeLinesCount++\n-\n- if (diff.type == GitDiff.Type.ADD) addsCount++\n- if (diff.type == GitDiff.Type.REMOVE) removesCount++\n-\n- if (diff.type == GitDiff.Type.SEPARATE) {\n- currentChangeLineNumber = diff.line.toInt() + addsCount - removesCount\n- }\n-\n- if (prev?.type != diff.type) {\n- currentChangeLinesCount = 0\n- }\n-\n- val currentChangeLine = currentChangeLineNumber + currentChangeLinesCount\n-\n- printLine(currentChangeLine, diff, prev)\n-\n+ printLine(diff, prev)\nprev = diff\n}\n}\n@@ -92,13 +71,13 @@ open class GenerateReleaseNotesDiffTask : DefaultTask() {\n/**\n* Prints styled line from git diff\n*/\n- private fun printLine(currentLine: Int, diff: GitDiff, prev: GitDiff?) {\n+ private fun printLine(diff: GitDiff, prev: GitDiff?) {\nval style = getStyleFromDiffType(diff.type)\n- val spaceString = getSpaces(currentLine)\n+ val paddingSpaces = getSpaces(diff.lineNumber)\nval lineToPrint = when {\nprev == null -> return\ndiff.type == GitDiff.Type.SEPARATE -> \"...\"\n- else -> \"$currentLine$spaceString${diff.line}\"\n+ else -> \"${diff.lineNumber}$paddingSpaces${diff.line}\"\n}\noutputStyler.style(style).println(lineToPrint)\n@@ -111,7 +90,7 @@ open class GenerateReleaseNotesDiffTask : DefaultTask() {\n}\n/**\n- * Simple tabulation method which adds spaces according to line length\n+ * Simple padding method which adds spaces according to line length\n*/\nprivate fun getSpaces(currentLine: Int): String {\nval space = \" \"\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/generate_release_notes_diff/GitDiff.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/generate_release_notes_diff/GitDiff.kt",
"diff": "@@ -3,11 +3,13 @@ package ru.surfstudio.android.build.tasks.generate_release_notes_diff\n/**\n* Simple git diff model. Contains information about single line differences.\n*\n- * @param line text of the line, which is affected by diff\n+ * @param line text of the line affected by diff\n+ * @param lineNumber number of the line affected by diff\n* @param type type of git difference\n*/\ndata class GitDiff(\nval line: String,\n+ val lineNumber: Int,\nval type: Type\n) {\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/generate_release_notes_diff/SimpleGitDiffParser.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/generate_release_notes_diff/SimpleGitDiffParser.kt",
"diff": "package ru.surfstudio.android.build.tasks.generate_release_notes_diff\n+import ru.surfstudio.android.build.tasks.generate_release_notes_diff.GitDiff.Type.*\n+\n/**\n* Simple parser for git diff.\n*/\n-object SimpleGitDiffParser {\n+class SimpleGitDiffParser {\nprivate val ADD_CHAR = \"+\"\nprivate val REMOVE_CHAR = \"-\"\nprivate val ADD_FILE_CHAR = \"+++\"\nprivate val REMOVE_FILE_CHAR = \"---\"\nprivate val SEPARATOR_CHAR = '@'\n+ private val SPACE_CHAR = ' '\n+\n+ private var currentChangeLineNumber = 0\n+ private var currentChangeLinesCount = 0\n+ private var addsCount = 0\n+ private var removesCount = 0\n+ private var lastDiff: GitDiff? = null\n/**\n* Parse diff string into list with [GitDiff]s\n@@ -25,29 +34,54 @@ object SimpleGitDiffParser {\nline.startsWith(ADD_FILE_CHAR) || line.startsWith(REMOVE_FILE_CHAR) -> {\n}\nline.startsWith(SEPARATOR_CHAR) -> diffs.add(makeSeparator(line))\n- line.startsWith(ADD_CHAR) -> diffs.add(makeAddDiff(line))\n- line.startsWith(REMOVE_CHAR) -> diffs.add(makeRemoveDiff(line))\n+ line.startsWith(ADD_CHAR) -> diffs.add(makeDiff(line, ADD))\n+ line.startsWith(REMOVE_CHAR) -> diffs.add(makeDiff(line, REMOVE))\n}\n}\nreturn diffs\n}\n- private fun makeAddDiff(line: String): GitDiff {\n- val lineWithoutChar = line.drop(1)\n- val lineWithSpace = \"$ADD_CHAR $lineWithoutChar\"\n- return GitDiff(lineWithSpace, GitDiff.Type.ADD)\n+ private fun makeSeparator(separatorLine: String): GitDiff {\n+ val regex = \"\\\\d+\".toRegex()\n+ val lineNumber = regex.find(separatorLine)?.value?.toIntOrNull() ?: 0\n+ currentChangeLineNumber = lineNumber + addsCount - removesCount\n+ return GitDiff(lineNumber.toString(), lineNumber, SEPARATE)\n+ .also { lastDiff = it }\n}\n- private fun makeRemoveDiff(line: String): GitDiff {\n- val lineWithoutChar = line.drop(1)\n- val lineWithSpace = \"$REMOVE_CHAR $lineWithoutChar\"\n- return GitDiff(lineWithSpace, GitDiff.Type.REMOVE)\n+ private fun makeDiff(line: String, type: GitDiff.Type): GitDiff {\n+ setDiffsCount(type)\n+ setCurrentChangedLinesCount(type)\n+ val lineNumber = currentChangeLineNumber + currentChangeLinesCount\n+ return GitDiff(addSpaceAfterFirstSymbol(line), lineNumber, type)\n+ .also { lastDiff = it }\n}\n- private fun makeSeparator(separatorLine: String): GitDiff {\n- val regex = \"\\\\d+\".toRegex()\n- val lineNumber = regex.find(separatorLine)?.value\n+ private fun setDiffsCount(type: GitDiff.Type) {\n+ when (type) {\n+ ADD -> addsCount++\n+ REMOVE -> removesCount++\n+ else -> {\n+ }\n+ }\n+ }\n- return GitDiff(lineNumber.toString(), GitDiff.Type.SEPARATE)\n+ private fun setCurrentChangedLinesCount(currentType: GitDiff.Type) {\n+ val lastType = lastDiff?.type\n+ when {\n+ //When it's just add change, we're adding one line to a current\n+ lastType == SEPARATE && currentType == ADD -> currentChangeLinesCount = 1\n+ //When type of next operation is different, we're resetting counter\n+ lastType != currentType -> currentChangeLinesCount = 0\n+ else -> currentChangeLinesCount++\n+ }\n+ }\n+\n+ private fun addSpaceAfterFirstSymbol(line: String): String {\n+ return buildString {\n+ append(line.first())\n+ append(SPACE_CHAR)\n+ append(line.drop(1))\n+ }\n}\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-690 Small parser refactor |
652,316 | 09.09.2019 11:35:31 | -10,800 | f81fa14dc722636edca80a17524168a52a2d037c | Generate release notes diff only for project mode | [
{
"change_type": "MODIFY",
"old_path": "ci-internal/JenkinsfilePullRequestJob.groovy",
"new_path": "ci-internal/JenkinsfilePullRequestJob.groovy",
"diff": "@@ -55,7 +55,6 @@ def stagesForProjectMode = [\n]\ndef stagesForReleaseMode = [\nPRE_MERGE,\n- GENERATE_RELEASE_NOTES_DIFF,\nCHECK_CONFIGURATION_IS_NOT_PROJECT_SNAPSHOT,\nCHECK_STABLE_MODULES_IN_ARTIFACTORY,\nCHECK_MODULES_IN_DEPENDENCY_TREE_OF_STABLE_MODULE_ALSO_STABLE,\n@@ -70,7 +69,6 @@ def stagesForReleaseMode = [\n]\ndef stagesForTargetBranchChangedMode = [\nPRE_MERGE,\n- GENERATE_RELEASE_NOTES_DIFF,\nBUILD,\nUNIT_TEST,\nINSTRUMENTATION_TEST\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-690 Generate release notes diff only for project mode |
652,314 | 10.09.2019 09:35:11 | -10,800 | 4abeee751c5ff8cb6fec2e259028d4eca0f280c9 | Added tag to release job | [
{
"change_type": "MODIFY",
"old_path": "ci-internal/ReleaseDeployJobJenkinsfile.groovy",
"new_path": "ci-internal/ReleaseDeployJobJenkinsfile.groovy",
"diff": "@@ -206,6 +206,7 @@ pipeline.stages = [\npipeline.stage(COMPONENT_ALPHA_COUNTER_PUSH, StageStrategy.UNSTABLE_WHEN_STAGE_ERROR) {\nRepositoryUtil.setDefaultJenkinsGitUser(script)\nscript.sh \"git commit -a -m \\\"Set component $componentName alpha counter to zero $RepositoryUtil.SKIP_CI_LABEL1 $RepositoryUtil.VERSION_LABEL1\\\"\"\n+ script.sh \"git tag -a $componentName-$componentVersion -m \\\"Set tag $componentName-$componentVersion $RepositoryUtil.SKIP_CI_LABEL1 $RepositoryUtil.VERSION_LABEL1\\\"\"\nRepositoryUtil.push(script, pipeline.repoUrl, pipeline.repoCredentialsId)\n},\npipeline.stage(MIRROR_COMPONENT, StageStrategy.UNSTABLE_WHEN_STAGE_ERROR) {\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-688 Added tag to release job |
652,322 | 10.09.2019 15:52:54 | -10,800 | 188bb58adabe4e175b82b01473eb46979660b175 | RELEASE_NOTES for template (format) | [
{
"change_type": "MODIFY",
"old_path": "template/RELEASE_NOTES.md",
"new_path": "template/RELEASE_NOTES.md",
"diff": "[TOC]\n# Template Release Notes\n## 0.5.0-alpha.0\n-* ANDDEP-329 Added RxJava2Debug\n\\ No newline at end of file\n+#### Template\n+* ANDDEP-329 Added RxJava2DebReleaseNotesFormatExceptionug\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-699 RELEASE_NOTES for template (format) |
652,322 | 11.09.2019 10:40:07 | -10,800 | f723ad6a8f08bd2a7b58fc48af8b5d03086a3b9c | fix git diff for add file | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/repository/BaseGitRepository.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/repository/BaseGitRepository.kt",
"diff": "@@ -258,7 +258,9 @@ abstract class BaseGitRepository {\n.setNewTree(currentTree)\n.setOldTree(oldTree)\n.call()\n- .map { it.oldPath }\n+ .map { entry ->\n+ entry.oldPath?.takeIf { it != DiffEntry.DEV_NULL } ?: entry.newPath\n+ }\n}\n/**\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-699 fix git diff for add file |
652,322 | 11.09.2019 15:13:38 | -10,800 | 61f81c15e5a12ddbbb5c89395153741c6740dfe7 | Fix diff RELEASE_NOTES in deprecated modules | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/CheckReleaseNotesChangedTask.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/CheckReleaseNotesChangedTask.kt",
"diff": "package ru.surfstudio.android.build.tasks\nimport org.gradle.api.DefaultTask\n-import org.gradle.api.GradleException\nimport org.gradle.api.tasks.TaskAction\nimport ru.surfstudio.android.build.Components\nimport ru.surfstudio.android.build.GradleProperties\n@@ -64,8 +63,8 @@ open class CheckReleaseNotesChangedTask : DefaultTask() {\nprivate fun isComponentChanged(resultByConfig: Boolean, resultByFile: Boolean) =\nresultByConfig.or(resultByFile)\n- private fun isReleaseFileIncluded(diffs: List<String>, componentName: String) =\n- diffs.contains(\"$componentName/$RELEASE_NOTES_FILE_NAME\")\n+ private fun isReleaseFileIncluded(diffs: List<String>, componentName: String): Boolean =\n+ diffs.find { it.contains(\"$componentName/$RELEASE_NOTES_FILE_NAME\") } != null\nprivate fun extractInputArguments() {\nif (!project.hasProperty(GradleProperties.COMPONENTS_CHANGED_REVISION_TO_COMPARE)) {\n@@ -73,8 +72,4 @@ open class CheckReleaseNotesChangedTask : DefaultTask() {\n}\nrevisionToCompare = project.findProperty(GradleProperties.COMPONENTS_CHANGED_REVISION_TO_COMPARE) as String\n}\n-\n- private fun fail(reason: String) {\n- throw GradleException(reason)\n- }\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-699 Fix diff RELEASE_NOTES in deprecated modules |
652,313 | 11.09.2019 15:45:48 | -10,800 | 5192780a6249bd576b5d427dbe6727a4bace7b25 | fixed script for local connection of android standard | [
{
"change_type": "MODIFY",
"old_path": "template/android-standard/androidStandardSettings.gradle",
"new_path": "template/android-standard/androidStandardSettings.gradle",
"diff": "@@ -5,17 +5,20 @@ import groovy.json.JsonSlurper\nif (gradle.ext.androidStandard.debugEnabled) {\ntry {\ndef androidStandardDebugDir = gradle.ext.androidStandard.debugDir\n- def modules = new JsonSlurper().parse(new File(\"$androidStandardDebugDir/buildSrc/modules.json\"), 'utf-8')\n- assert modules instanceof List\n+ def components = new JsonSlurper().parse(new File(\"$androidStandardDebugDir/buildSrc/components.json\"), 'utf-8')\n+ assert components instanceof List\nincludeBuild(\"$androidStandardDebugDir\") {\ndependencySubstitution {\n- modules.each {\n- substitute module(\"ru.surfstudio.android:$it\") with project(\":$it\")\n+ components.each { component ->\n+ if (component.libraries != null && !component.libraries.isEmpty()) {\n+ component.libraries.each { library ->\n+ substitute module(\"ru.surfstudio.android:${library.artifactName}\") with project(\":${library.artifactName}\")\n+ }\n+ }\n}\n}\n}\n} catch (FileNotFoundException ignored) {\n- logger.error(\"file buildSrc/modules.json in local android standard folder not found\")\n+ logger.error(\"file buildSrc/components.json in local android standard folder not found\")\n}\n-\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-702 fixed script for local connection of android standard |
652,322 | 17.09.2019 12:59:19 | -10,800 | 8e7e1295081136e7935faddc89ddda58f613b66a | Remove checking tags for mirror repo & refactor | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/GitTree.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/GitTree.kt",
"diff": "@@ -247,9 +247,7 @@ class GitTree(\nif (branchNameNames.size != 1) {\nthrow ManyBranchesFoundException(it.value.name, branchNameNames)\n}\n-\n- val tags = mirrorRepository.getTagsForCommit(it.value)\n- CommitWithBranch(it.value, tags = tags, branch = branchNameNames[0])\n+ CommitWithBranch(it.value, branch = branchNameNames[0])\n}.toSet()\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/repository/BaseGitRepository.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/repository/BaseGitRepository.kt",
"diff": "@@ -4,14 +4,12 @@ import org.eclipse.jgit.api.Git\nimport org.eclipse.jgit.api.ListBranchCommand\nimport org.eclipse.jgit.api.ResetCommand\nimport org.eclipse.jgit.diff.DiffEntry\n-import org.eclipse.jgit.lib.Constants\nimport org.eclipse.jgit.lib.ObjectId\nimport org.eclipse.jgit.lib.Ref\nimport org.eclipse.jgit.revwalk.RevCommit\nimport org.eclipse.jgit.treewalk.CanonicalTreeParser\nimport ru.surfstudio.android.build.exceptions.deploy_to_mirror.BranchCanNotBeDefinedException\nimport ru.surfstudio.android.build.exceptions.deploy_to_mirror.BranchNotFoundException\n-import ru.surfstudio.android.build.utils.EMPTY_STRING\nimport ru.surfstudio.android.build.utils.extractBranchNames\nimport java.io.File\n@@ -27,8 +25,6 @@ abstract class BaseGitRepository {\nprotected val git: Git by lazy { Git.open(repositoryPath) }\n- protected val tags: List<Ref> by lazy { git.tagList().call() }\n-\n/**\n* Delete repository\n*/\n@@ -43,10 +39,6 @@ abstract class BaseGitRepository {\n.call()\n.first()\n- fun getTagsForCommit(commit: RevCommit): List<String> =\n- tags.filter { it.objectId == commit }\n- .map { it.name.replace(Constants.R_TAGS, EMPTY_STRING) }\n-\n/**\n* Get all branches\n*/\n@@ -222,11 +214,6 @@ abstract class BaseGitRepository {\n?.conflicts\n?.map { it.key } ?: emptyList()\n- fun tag(commit: RevCommit, tagName: String) = git.tag()\n- .setObjectId(commit)\n- .setName(tagName)\n- .call()\n-\n/**\n* add to git index\n*\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/repository/MirrorRepository.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/repository/MirrorRepository.kt",
"diff": "@@ -36,13 +36,16 @@ class MirrorRepository(dirPath: String) : BaseGitRepository() {\n)\n)\n.call()\n-\n}\n+ fun tag(commit: RevCommit, tagName: String) = git.tag()\n+ .setObjectId(commit)\n+ .setName(tagName)\n+ .call()\n+\nfun getCommitByStandardHash(standardHash: String): RevCommit = git.log()\n.all()\n.call()\n.find { it.mirrorStandardHash == standardHash }\n?: throw MirrorCommitNotFoundByStandardHashException(standardHash)\n-\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/repository/StandardRepository.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/repository/StandardRepository.kt",
"diff": "package ru.surfstudio.android.build.tasks.deploy_to_mirror.repository\n+import org.eclipse.jgit.lib.Constants\n+import org.eclipse.jgit.lib.Ref\n+import org.eclipse.jgit.revwalk.RevCommit\n+import ru.surfstudio.android.build.utils.EMPTY_STRING\nimport java.io.File\n/**\n@@ -13,4 +17,10 @@ class StandardRepository : BaseGitRepository() {\noverride val repositoryPath: File = File(TEMP_DIR_PATH)\noverride val repositoryName = \"Standard\"\n+\n+ private val tags: List<Ref> by lazy { git.tagList().call() }\n+\n+ fun getTagsForCommit(commit: RevCommit): List<String> =\n+ tags.filter { it.objectId == commit }\n+ .map { it.name.replace(Constants.R_TAGS, EMPTY_STRING) }\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-703 Remove checking tags for mirror repo & refactor |
652,312 | 17.09.2019 11:44:51 | -10,800 | cc827c175604ef11b636d9ad1e23e454230eef2a | Removed camera-view dependency from picture-provider-sample | [
{
"change_type": "MODIFY",
"old_path": ".gitignore",
"new_path": ".gitignore",
"diff": ".idea/\n.DS_Store\n/build\n+*/build\n+*/.cxx\n+*/*/.cxx\n/captures\n+buildSrc/modules.json\n.externalNativeBuild\n/temp\n.mirror\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "picture-provider/RELEASE_NOTES.md",
"new_path": "picture-provider/RELEASE_NOTES.md",
"diff": "## 0.5.0-alpha\n##### Picture-provider\n* ANDDEP-687 Changed \"androidx.exifinterface:exifinterface\" dependency from \"api\" to \"implementation\" type\n+* ANDDEP-729 Removed camera-view dependency from picture-provider-sample\n## 0.3.0\n##### Picture-provider\n* ANDDEP-235 - refactoring and adding functional:\n"
},
{
"change_type": "MODIFY",
"old_path": "picture-provider/sample/build.gradle",
"new_path": "picture-provider/sample/build.gradle",
"diff": "@@ -13,7 +13,6 @@ dependencies {\nDependencyConfigurator.implementation(project, \"androidx.recyclerview:recyclerview\")\nDependencyConfigurator.implementation(project, \"org.jetbrains.anko:anko-common\")\n- DependencyConfigurator.implementation(project, \"ru.surfstudio.android:camera-view\")\nDependencyConfigurator.kapt(project, \"com.google.dagger:dagger-compiler\")\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "picture-provider/sample/src/main/java/ru/surfstudio/android/pictureprovider/sample/ui/screen/main/MainActivityView.kt",
"new_path": "picture-provider/sample/src/main/java/ru/surfstudio/android/pictureprovider/sample/ui/screen/main/MainActivityView.kt",
"diff": "@@ -21,9 +21,11 @@ class MainActivityView : BaseRenderableActivityView<MainScreenModel>() {\n@IdRes\noverride fun getContentView(): Int = R.layout.activity_main\n- override fun onCreate(savedInstanceState: Bundle?,\n+ override fun onCreate(\n+ savedInstanceState: Bundle?,\npersistentState: PersistableBundle?,\n- viewRecreated: Boolean) {\n+ viewRecreated: Boolean\n+ ) {\nsuper.onCreate(savedInstanceState, persistentState, viewRecreated)\ncamera_btn.setOnClickListener { presenter.openCamera() }\n@@ -41,8 +43,4 @@ class MainActivityView : BaseRenderableActivityView<MainScreenModel>() {\noverride fun createConfigurator(): DefaultActivityScreenConfigurator = MainScreenConfigurator(intent)\noverride fun getScreenName(): String = \"MainActivity\"\n-\n- fun startCamera() = camera_preview.start()\n-\n- fun stopCamera() = camera_preview.stop()\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "picture-provider/sample/src/main/java/ru/surfstudio/android/pictureprovider/sample/ui/screen/main/MainPresenter.kt",
"new_path": "picture-provider/sample/src/main/java/ru/surfstudio/android/pictureprovider/sample/ui/screen/main/MainPresenter.kt",
"diff": "@@ -3,10 +3,8 @@ package ru.surfstudio.android.pictureprovider.sample.ui.screen.main\nimport io.reactivex.Single\nimport ru.surfstudio.android.core.mvp.presenter.BasePresenter\nimport ru.surfstudio.android.core.mvp.presenter.BasePresenterDependency\n-import ru.surfstudio.android.core.ui.permission.PermissionManager\nimport ru.surfstudio.android.dagger.scope.PerScreen\nimport ru.surfstudio.android.message.MessageController\n-import ru.surfstudio.android.picturechooser.CameraStoragePermissionRequest\nimport ru.surfstudio.android.picturechooser.PicturePermissionChecker\nimport ru.surfstudio.android.picturechooser.PictureProvider\nimport ru.surfstudio.android.pictureprovider.sample.R\n@@ -20,7 +18,6 @@ import javax.inject.Inject\ninternal class MainPresenter @Inject constructor(\nbasePresenterDependency: BasePresenterDependency,\nstringsProvider: StringsProvider,\n- private val permissionManager: PermissionManager,\nprivate val picturePermissionChecker: PicturePermissionChecker,\nprivate val photoProvider: PictureProvider,\nprivate val messageController: MessageController\n@@ -58,18 +55,4 @@ internal class MainPresenter @Inject constructor(\nmessageController.show(it.toString())\n}\n}\n-\n- override fun onResume() {\n- super.onResume()\n- if (checkPermission()) view.startCamera()\n- }\n-\n- override fun onPause() {\n- super.onPause()\n- if (checkPermission()) view.stopCamera()\n- }\n-\n- private fun checkPermission(): Boolean {\n- return permissionManager.check(CameraStoragePermissionRequest()).isGranted\n- }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "picture-provider/sample/src/main/res/layout/activity_main.xml",
"new_path": "picture-provider/sample/src/main/res/layout/activity_main.xml",
"diff": "android:layout_marginTop=\"@dimen/default_margin\"\nandroid:layout_marginBottom=\"@dimen/default_margin\"\nandroid:text=\"@string/chooser_save_btn_text\" />\n-\n- <com.google.android.cameraview.CameraView\n- android:id=\"@+id/camera_preview\"\n- android:layout_width=\"match_parent\"\n- android:layout_height=\"600dp\"\n- android:layout_below=\"@id/chooser_save_btn\"/>\n</RelativeLayout>\n</ScrollView>\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-729 Removed camera-view dependency from picture-provider-sample |
652,322 | 19.09.2019 10:35:04 | -10,800 | 8c82ff36576233b27a5199710f57cb9ec3de4fed | Fix Android CI (instrumental tests stage) | [
{
"change_type": "MODIFY",
"old_path": "analytics/RELEASE_NOTES.md",
"new_path": "analytics/RELEASE_NOTES.md",
"diff": "# Analytics Release Notes\n## 0.5.0-alpha\n##### Analytics\n-* TODO\n+* ANDDEP-714 Refactor instrumental tests\n## 0.4.0\n##### Analytics\n* ANDDEP-294 Improved analytics module\n"
},
{
"change_type": "MODIFY",
"old_path": "analytics/sample/build.gradle",
"new_path": "analytics/sample/build.gradle",
"diff": "@@ -4,7 +4,7 @@ import ru.surfstudio.android.build.DependencyConfigurator\nGoogleServicesPlugin.config.disableVersionCheck = true\napply from: \"$rootDir/buildSrc/androidSample.gradle\"\n-//apply plugin: 'io.fabric'\n+apply plugin: 'io.fabric'\nandroid {\next.enableCrashlytics = false\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/androidModule.gradle",
"new_path": "buildSrc/androidModule.gradle",
"diff": "@@ -19,8 +19,6 @@ android {\ntargetSdkVersion project.ext.targetSdkVersion\nversionCode project.ext.moduleVersionCode\nversionName Components.getModuleVersion(project.name)\n- testBuildType \"debug\"\n- testInstrumentationRunner \"androidx.test.runner.AndroidJUnitRunner\"\n}\ncompileOptions {\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/androidSample.gradle",
"new_path": "buildSrc/androidSample.gradle",
"diff": "@@ -53,9 +53,3 @@ dependencies {\nDependencyConfigurator.projectAndroidTestImplementation(project, \"sample-common\")\n}\n\\ No newline at end of file\n-\n-task printTestInstrumentationRunnerName {\n- doLast {\n- println \"$android.defaultConfig.testInstrumentationRunner\"\n- }\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/baseBuild.gradle",
"new_path": "buildSrc/baseBuild.gradle",
"diff": "@@ -4,3 +4,9 @@ apply from: \"$rootDir/buildSrc/androidModule.gradle\"\nDependencyConfigurator.configure(project)\nconfigureDeploy(this)\n+\n+task printTestInstrumentationRunnerName {\n+ doLast {\n+ println \"$android.defaultConfig.testInstrumentationRunner\"\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/components.json",
"new_path": "buildSrc/components.json",
"diff": "{\n\"name\": \"junit:junit\",\n\"type\": \"testImplementation\"\n- },\n- {\n- \"name\": \"androidx.test:runner\",\n- \"type\": \"androidTestImplementation\"\n- },\n- {\n- \"name\": \"androidx.test.espresso:espresso-core\",\n- \"type\": \"androidTestImplementation\"\n}\n],\n\"android_standard_dependencies\": [\n{\n\"name\": \"junit:junit\",\n\"type\": \"testImplementation\"\n- },\n- {\n- \"name\": \"androidx.test:runner\",\n- \"type\": \"androidTestImplementation\"\n- },\n- {\n- \"name\": \"androidx.test.espresso:espresso-core\",\n- \"type\": \"androidTestImplementation\"\n}\n],\n\"android_standard_dependencies\": [\n{\n\"name\": \"androidx.appcompat:appcompat\",\n\"type\": \"implementation\"\n+ },\n+ {\n+ \"name\": \"junit:junit\",\n+ \"type\": \"testImplementation\"\n}\n],\n\"android_standard_dependencies\": [\n"
},
{
"change_type": "MODIFY",
"old_path": "ci-internal/JenkinsfilePullRequestJob.groovy",
"new_path": "ci-internal/JenkinsfilePullRequestJob.groovy",
"diff": "@@ -78,8 +78,8 @@ def getTestInstrumentationRunnerName = { script, prefix ->\ndef defaultInstrumentationRunnerGradleTaskName = \"printTestInstrumentationRunnerName\"\nreturn script.sh(\nreturnStdout: true,\n- script: \"./gradlew :$prefix:$defaultInstrumentationRunnerGradleTaskName | tail -4 | head -1\"\n- )\n+ script: \"./gradlew -q :$prefix:$defaultInstrumentationRunnerGradleTaskName\"\n+ ).split(\"\\n\").last()\n}\n//init\n"
},
{
"change_type": "MODIFY",
"old_path": "datalist/RELEASE_NOTES.md",
"new_path": "datalist/RELEASE_NOTES.md",
"diff": "# Datalist Release Notes\n## 0.5.0-alpha\n##### Datalist-limit-offset\n-* TODO\n+* ANDDEP-714 Refactor instrumental tests\n## 0.4.0\n##### Datalist-limit-offset\n* ANDDEP-242 Added the ability to force filtering in the DataList.merge method according to custom criteria to eliminate the same elements\n"
},
{
"change_type": "DELETE",
"old_path": "datalist/lib-datalist-limit-offset/src/androidTest/java/ru/surfstudio/android/datalistlimitoffset/ExampleInstrumentedTest.java",
"new_path": null,
"diff": "-package ru.surfstudio.android.datalistlimitoffset;\n-\n-import android.content.Context;\n-\n-import androidx.test.InstrumentationRegistry;\n-import androidx.test.runner.AndroidJUnit4;\n-\n-import org.junit.Test;\n-import org.junit.runner.RunWith;\n-\n-import static org.junit.Assert.assertEquals;\n-\n-/**\n- * Instrumented test, which will execute on an Android device.\n- *\n- * @see <a href=\"http://d.android.com/tools/testing\">Testing documentation</a>\n- */\n-@RunWith(AndroidJUnit4.class)\n-public class ExampleInstrumentedTest {\n- @Test\n- public void useAppContext() throws Exception {\n- // Context of the app under test.\n- Context appContext = InstrumentationRegistry.getTargetContext();\n-\n- assertEquals(\"ru.surfstudio.android.datalistlimitoffset.test\", appContext.getPackageName());\n- }\n-}\n"
},
{
"change_type": "DELETE",
"old_path": "datalist/lib-datalist-limit-offset/src/test/java/ru/surfstudio/android/datalistlimitoffset/ExampleUnitTest.java",
"new_path": null,
"diff": "-package ru.surfstudio.android.datalistlimitoffset;\n-\n-import org.junit.Test;\n-\n-import static org.junit.Assert.assertEquals;\n-\n-/**\n- * Example local unit test, which will execute on the development machine (host).\n- *\n- * @see <a href=\"http://d.android.com/tools/testing\">Testing documentation</a>\n- */\n-public class ExampleUnitTest {\n- @Test\n- public void addition_isCorrect() throws Exception {\n- assertEquals(4, 2 + 2);\n- }\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "datalist/lib-datalist-page-count/src/androidTest/java/ru/surfstudio/android/datalistpagecount/ExampleInstrumentedTest.java",
"new_path": null,
"diff": "-package ru.surfstudio.android.datalistpagecount;\n-\n-import android.content.Context;\n-\n-import androidx.test.InstrumentationRegistry;\n-import androidx.test.runner.AndroidJUnit4;\n-\n-import org.junit.Test;\n-import org.junit.runner.RunWith;\n-\n-import static org.junit.Assert.assertEquals;\n-\n-/**\n- * Instrumented test, which will execute on an Android device.\n- *\n- * @see <a href=\"http://d.android.com/tools/testing\">Testing documentation</a>\n- */\n-@RunWith(AndroidJUnit4.class)\n-public class ExampleInstrumentedTest {\n- @Test\n- public void useAppContext() throws Exception {\n- // Context of the app under test.\n- Context appContext = InstrumentationRegistry.getTargetContext();\n-\n- assertEquals(\"ru.surfstudio.android.datalistpagecount.test\", appContext.getPackageName());\n- }\n-}\n"
},
{
"change_type": "MODIFY",
"old_path": "security/sample/src/androidTest/java/ru/surfstudio/android/security/SecuritySampleTest.kt",
"new_path": "security/sample/src/androidTest/java/ru/surfstudio/android/security/SecuritySampleTest.kt",
"diff": "@@ -12,7 +12,6 @@ import ru.surfstudio.android.security.sample.R\nimport ru.surfstudio.android.security.sample.ui.screen.main.MainActivityView\nimport ru.surfstudio.android.security.sample.ui.screen.pin.CreatePinActivityView\n-\nprivate const val PINT_TEXT = \"1234\"\nprivate const val LONG_DURATION_TIMEOUT: Long = 4000\n"
},
{
"change_type": "MODIFY",
"old_path": "util-ktx/RELEASE_NOTES.md",
"new_path": "util-ktx/RELEASE_NOTES.md",
"diff": "* `DateUtil.parseDate ()` methods can receive `NULL` as input parameter. Will return `NULL` in this case\n* Added method `DateUtil.reformatDate ()`, which allows to reformat string representation of the date from one format to another\n* ANDDEP-687 Changed \"com.google.android.material:material\" dependency from \"api\" to \"implementation\" type\n+* ANDDEP-714 Refactor unit tests\n## 0.4.0\n##### Util-ktx\n* ANDDEP-319 Properties of `isAtLeast ...` of class [`SdkUtils`] (util-ktx / src / main / java / ru / surfstudio / android / utilktx / util / SdkUtils.kt)\n"
},
{
"change_type": "RENAME",
"old_path": "util-ktx/src/test/java/ru/surfstudio/android/utilktx/util/java/DateUtilTests.java",
"new_path": "util-ktx/lib-util-ktx/src/test/java/ru/surfstudio/android/utilktx/util/java/DateUtilTests.java",
"diff": ""
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-714 Fix Android CI (instrumental tests stage) |
652,316 | 19.09.2019 16:31:53 | -10,800 | a36e83e126c61fe6a80957cb1beaa6b3ae9b8bcd | Documentation fixes and minor refactoring | [
{
"change_type": "MODIFY",
"old_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/input/InputFormMiddleware.kt",
"new_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/input/InputFormMiddleware.kt",
"diff": "@@ -18,7 +18,7 @@ class InputFormMiddleware @Inject constructor(\noverride fun transform(eventStream: Observable<InputFormEvent>): Observable<out InputFormEvent> =\ntransformations(eventStream) {\n- +eventStream.mapNavigationDefault()\n+ +eventStream.mapAutoNavigation()\n+map<SubmitClicked> { InputFormClosed(InputFormActivityRoute(), sh.inputString.value) }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/main/MainMiddleware.kt",
"new_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/main/MainMiddleware.kt",
"diff": "@@ -19,7 +19,7 @@ class MainMiddleware @Inject constructor(\nNavigatorMiddleware<MainEvent> {\noverride fun transform(eventStream: Observable<MainEvent>) = transformations(eventStream) {\n- +mapNavigationDefault()\n+ +mapAutoNavigation()\n+openScreenForResult(InputFormActivityRoute::class.java, InputFormResult())\n+react<InputFormResult>(::showResult)\n}\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-671 Documentation fixes and minor refactoring |
652,316 | 20.09.2019 11:20:52 | -10,800 | 98ea262af34920d4be6905aee00c8919a9051df3 | Add React screen module + refactor names | [
{
"change_type": "MODIFY",
"old_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/input/InputFormActivityView.kt",
"new_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/input/InputFormActivityView.kt",
"diff": "@@ -7,7 +7,7 @@ import com.jakewharton.rxbinding2.widget.textChanges\nimport kotlinx.android.synthetic.main.activity_input_form.*\nimport ru.surfstudio.android.core.mvi.event.hub.owner.SingleHubOwner\nimport ru.surfstudio.android.core.mvi.sample.R\n-import ru.surfstudio.android.core.mvi.sample.ui.base.hub.BaseEventHub\n+import ru.surfstudio.android.core.mvi.sample.ui.base.hub.ScreenEventHub\nimport ru.surfstudio.android.core.mvi.ui.BaseReactActivityView\nimport javax.inject.Inject\nimport ru.surfstudio.android.core.mvi.sample.ui.screen.input.InputFormEvent.*\n@@ -18,7 +18,7 @@ import ru.surfstudio.android.core.mvi.sample.ui.screen.input.InputFormEvent.*\nclass InputFormActivityView : BaseReactActivityView(), SingleHubOwner<InputFormEvent> {\n@Inject\n- override lateinit var hub: BaseEventHub<InputFormEvent>\n+ override lateinit var hub: ScreenEventHub<InputFormEvent>\n@Inject\nlateinit var sh: InputFormStateHolder\n"
},
{
"change_type": "MODIFY",
"old_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/input/InputFormConfigurator.kt",
"new_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/input/InputFormConfigurator.kt",
"diff": "@@ -4,18 +4,18 @@ import android.content.Intent\nimport dagger.Component\nimport dagger.Module\nimport dagger.Provides\n-import ru.surfstudio.android.core.mvi.sample.ui.base.binder.BaseBinder\n-import ru.surfstudio.android.core.mvi.sample.ui.base.hub.BaseEventHub\n+import ru.surfstudio.android.core.mvi.sample.ui.base.binder.ScreenBinder\n+import ru.surfstudio.android.core.mvi.sample.ui.base.di.ReactScreenModule\n+import ru.surfstudio.android.core.mvi.sample.ui.base.hub.ScreenEventHub\n+import ru.surfstudio.android.core.mvi.sample.ui.base.hub.dependency.ScreenEventHubDependency\nimport ru.surfstudio.android.core.mvi.sample.ui.base.middleware.dependency.BaseNavMiddlewareDependency\nimport ru.surfstudio.android.core.mvp.configurator.BindableScreenComponent\nimport ru.surfstudio.android.core.mvp.configurator.ScreenComponent\nimport ru.surfstudio.android.core.mvp.error.ErrorHandler\nimport ru.surfstudio.android.core.mvp.presenter.BasePresenterDependency\n-import ru.surfstudio.android.core.ui.event.ScreenEventDelegateManager\nimport ru.surfstudio.android.core.ui.navigation.activity.navigator.ActivityNavigator\nimport ru.surfstudio.android.core.ui.navigation.fragment.FragmentNavigator\nimport ru.surfstudio.android.core.ui.provider.ActivityProvider\n-import ru.surfstudio.android.core.ui.state.ScreenState\nimport ru.surfstudio.android.dagger.scope.PerScreen\nimport ru.surfstudio.android.mvp.dialog.navigation.navigator.DialogNavigator\nimport ru.surfstudio.android.rx.extension.scheduler.SchedulersProvider\n@@ -27,46 +27,29 @@ class InputFormScreenConfigurator(intent: Intent) : DefaultActivityScreenConfigu\n@PerScreen\n@Component(dependencies = [DefaultActivityComponent::class],\n- modules = [DefaultActivityScreenModule::class, InputFormScreenModule::class])\n+ modules = [DefaultActivityScreenModule::class, InputFormScreenModule::class, ReactScreenModule::class])\ninternal interface InputFormScreenComponent\n: BindableScreenComponent<InputFormActivityView>\n@Module\ninternal class InputFormScreenModule {\n- @Provides\n- @PerScreen\n- fun provideFragmentNavigator(activityProvider: ActivityProvider): FragmentNavigator = FragmentNavigator(activityProvider)\n-\n-\n- @Provides\n- @PerScreen\n- fun provideBaseMiddlewareDependency(\n- activityNavigator: ActivityNavigator,\n- schedulersProvider: SchedulersProvider,\n- fragmentNavigator: FragmentNavigator,\n- dialogNavigator: DialogNavigator,\n- errorHandler: ErrorHandler\n- ) = BaseNavMiddlewareDependency(activityNavigator, fragmentNavigator, dialogNavigator, schedulersProvider, errorHandler)\n@Provides\n@PerScreen\nfun provideEventHub(\n- screenState: ScreenState,\n- screenEventDelegateManager: ScreenEventDelegateManager\n- ): BaseEventHub<InputFormEvent> = BaseEventHub(\n- screenState,\n- screenEventDelegateManager\n- ) { InputFormEvent.InputFormLifecycle(it) }\n+ screenEventHubDependency: ScreenEventHubDependency\n+ ): ScreenEventHub<InputFormEvent> =\n+ ScreenEventHub(screenEventHubDependency) { InputFormEvent.InputFormLifecycle(it) }\n@PerScreen\n@Provides\nfun provideBinder(\nbasePresenterDependency: BasePresenterDependency,\n- eventHub: BaseEventHub<InputFormEvent>,\n+ eventHub: ScreenEventHub<InputFormEvent>,\nmiddleware: InputFormMiddleware,\nreactor: InputFormReactor,\nstateHolder: InputFormStateHolder\n- ): Any = BaseBinder(basePresenterDependency)\n+ ): Any = ScreenBinder(basePresenterDependency)\n.apply { bind(eventHub, middleware, stateHolder, reactor) }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/list/ComplexListActivityView.kt",
"new_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/list/ComplexListActivityView.kt",
"diff": "@@ -13,7 +13,7 @@ import ru.surfstudio.android.core.mvi.ui.BaseReactActivityView\nimport ru.surfstudio.android.easyadapter.ItemList\nimport ru.surfstudio.android.easyadapter.pagination.PaginationState\nimport ru.surfstudio.android.core.mvi.sample.ui.screen.list.controller.ComplexListController\n-import ru.surfstudio.android.core.mvi.sample.ui.base.hub.BaseEventHub\n+import ru.surfstudio.android.core.mvi.sample.ui.base.hub.ScreenEventHub\nimport ru.surfstudio.android.core.mvi.sample.ui.base.adapter.PaginationableAdapter\nimport ru.surfstudio.android.core.mvi.sample.ui.base.extension.observeMainLoading\nimport ru.surfstudio.android.core.mvi.sample.ui.base.extension.observeSwrLoading\n@@ -37,7 +37,7 @@ class ComplexListActivityView : BaseReactActivityView() {\nlateinit var sh: ComplexListStateHolder\n@Inject\n- lateinit var hub: BaseEventHub<ComplexListEvent>\n+ lateinit var hub: ScreenEventHub<ComplexListEvent>\noverride fun onCreate(savedInstanceState: Bundle?, persistentState: PersistableBundle?, viewRecreated: Boolean) {\nsuper.onCreate(savedInstanceState, persistentState, viewRecreated)\n"
},
{
"change_type": "MODIFY",
"old_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/list/ComplexListScreenConfigurator.kt",
"new_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/list/ComplexListScreenConfigurator.kt",
"diff": "@@ -4,18 +4,14 @@ import android.content.Intent\nimport dagger.Component\nimport dagger.Module\nimport dagger.Provides\n-import ru.surfstudio.android.core.mvi.sample.ui.base.binder.BaseBinder\n-import ru.surfstudio.android.core.mvi.sample.ui.base.hub.BaseEventHub\n-import ru.surfstudio.android.core.mvi.sample.ui.base.middleware.dependency.BaseMiddlewareDependency\n+import ru.surfstudio.android.core.mvi.sample.ui.base.binder.ScreenBinder\n+import ru.surfstudio.android.core.mvi.sample.ui.base.di.ReactScreenModule\n+import ru.surfstudio.android.core.mvi.sample.ui.base.hub.ScreenEventHub\n+import ru.surfstudio.android.core.mvi.sample.ui.base.hub.dependency.ScreenEventHubDependency\nimport ru.surfstudio.android.core.mvp.configurator.BindableScreenComponent\nimport ru.surfstudio.android.core.mvp.configurator.ScreenComponent\n-import ru.surfstudio.android.core.mvp.error.ErrorHandler\nimport ru.surfstudio.android.core.mvp.presenter.BasePresenterDependency\n-import ru.surfstudio.android.core.ui.event.ScreenEventDelegateManager\n-import ru.surfstudio.android.core.ui.navigation.activity.navigator.ActivityNavigator\n-import ru.surfstudio.android.core.ui.state.ScreenState\nimport ru.surfstudio.android.dagger.scope.PerScreen\n-import ru.surfstudio.android.rx.extension.scheduler.SchedulersProvider\nimport ru.surfstudio.android.sample.dagger.ui.base.configurator.DefaultActivityScreenConfigurator\nimport ru.surfstudio.android.sample.dagger.ui.base.dagger.activity.DefaultActivityComponent\nimport ru.surfstudio.android.sample.dagger.ui.base.dagger.screen.DefaultActivityScreenModule\n@@ -25,40 +21,29 @@ class ComplexListScreenConfigurator(intent: Intent) : DefaultActivityScreenConfi\n@PerScreen\n@Component(dependencies = [DefaultActivityComponent::class],\n- modules = [DefaultActivityScreenModule::class, ComplexListScreenModule::class])\n+ modules = [DefaultActivityScreenModule::class, ComplexListScreenModule::class, ReactScreenModule::class])\ninternal interface ComplexListScreenComponent\n: BindableScreenComponent<ComplexListActivityView>\n@Module\ninternal class ComplexListScreenModule(route: ComplexListActivityRoute) : DefaultCustomScreenModule<ComplexListActivityRoute>(route) {\n- @Provides\n- @PerScreen\n- fun provideBaseMiddlewareDependency(\n- activityNavigator: ActivityNavigator,\n- schedulersProvider: SchedulersProvider,\n- errorHandler: ErrorHandler\n- ) = BaseMiddlewareDependency(activityNavigator, schedulersProvider, errorHandler)\n-\n@Provides\n@PerScreen\nfun provideEventHub(\n- screenState: ScreenState,\n- screenEventDelegateManager: ScreenEventDelegateManager\n- ): BaseEventHub<ComplexListEvent> = BaseEventHub(\n- screenState,\n- screenEventDelegateManager\n- ) { ComplexListEvent.ComplexListLifecycle(it) }\n+ screenEventHubDependency: ScreenEventHubDependency\n+ ): ScreenEventHub<ComplexListEvent> =\n+ ScreenEventHub(screenEventHubDependency, ComplexListEvent::ComplexListLifecycle)\n@PerScreen\n@Provides\nfun provideBinder(\nbasePresenterDependency: BasePresenterDependency,\n- eventHub: BaseEventHub<ComplexListEvent>,\n+ eventHub: ScreenEventHub<ComplexListEvent>,\nmiddleware: ComplexListMiddleware,\nreactor: ComplexListReactor,\nstateHolder: ComplexListStateHolder\n- ): Any = BaseBinder(basePresenterDependency)\n+ ): Any = ScreenBinder(basePresenterDependency)\n.apply { bind(eventHub, middleware, stateHolder, reactor) }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/main/MainActivityView.kt",
"new_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/main/MainActivityView.kt",
"diff": "@@ -6,7 +6,7 @@ import com.jakewharton.rxbinding2.view.clicks\nimport kotlinx.android.synthetic.main.activity_main.*\nimport ru.surfstudio.android.core.mvi.event.hub.owner.SingleHubOwner\nimport ru.surfstudio.android.core.mvi.sample.R\n-import ru.surfstudio.android.core.mvi.sample.ui.base.hub.BaseEventHub\n+import ru.surfstudio.android.core.mvi.sample.ui.base.hub.ScreenEventHub\nimport ru.surfstudio.android.core.mvi.ui.BaseReactActivityView\nimport ru.surfstudio.android.logger.Logger\nimport ru.surfstudio.android.logger.logging_strategies.impl.timber.TimberLoggingStrategy\n@@ -19,7 +19,7 @@ import javax.inject.Inject\nclass MainActivityView : BaseReactActivityView(), SingleHubOwner<MainEvent> {\n@Inject\n- override lateinit var hub: BaseEventHub<MainEvent>\n+ override lateinit var hub: ScreenEventHub<MainEvent>\noverride fun createConfigurator() = MainScreenConfigurator(intent)\n"
},
{
"change_type": "MODIFY",
"old_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/main/MainScreenConfigurator.kt",
"new_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/main/MainScreenConfigurator.kt",
"diff": "@@ -4,18 +4,18 @@ import android.content.Intent\nimport dagger.Component\nimport dagger.Module\nimport dagger.Provides\n-import ru.surfstudio.android.core.mvi.sample.ui.base.binder.BaseBinder\n-import ru.surfstudio.android.core.mvi.sample.ui.base.hub.BaseEventHub\n+import ru.surfstudio.android.core.mvi.sample.ui.base.binder.ScreenBinder\n+import ru.surfstudio.android.core.mvi.sample.ui.base.di.ReactScreenModule\n+import ru.surfstudio.android.core.mvi.sample.ui.base.hub.ScreenEventHub\n+import ru.surfstudio.android.core.mvi.sample.ui.base.hub.dependency.ScreenEventHubDependency\nimport ru.surfstudio.android.core.mvi.sample.ui.base.middleware.dependency.BaseNavMiddlewareDependency\nimport ru.surfstudio.android.core.mvp.configurator.BindableScreenComponent\nimport ru.surfstudio.android.core.mvp.configurator.ScreenComponent\nimport ru.surfstudio.android.core.mvp.error.ErrorHandler\nimport ru.surfstudio.android.core.mvp.presenter.BasePresenterDependency\n-import ru.surfstudio.android.core.ui.event.ScreenEventDelegateManager\nimport ru.surfstudio.android.core.ui.navigation.activity.navigator.ActivityNavigator\nimport ru.surfstudio.android.core.ui.navigation.fragment.FragmentNavigator\nimport ru.surfstudio.android.core.ui.provider.ActivityProvider\n-import ru.surfstudio.android.core.ui.state.ScreenState\nimport ru.surfstudio.android.dagger.scope.PerScreen\nimport ru.surfstudio.android.mvp.dialog.navigation.navigator.DialogNavigator\nimport ru.surfstudio.android.rx.extension.scheduler.SchedulersProvider\n@@ -27,45 +27,27 @@ class MainScreenConfigurator(intent: Intent) : DefaultActivityScreenConfigurator\n@PerScreen\n@Component(dependencies = [DefaultActivityComponent::class],\n- modules = [DefaultActivityScreenModule::class, MainScreenModule::class])\n+ modules = [DefaultActivityScreenModule::class, MainScreenModule::class, ReactScreenModule::class])\ninternal interface MainScreenComponent\n: BindableScreenComponent<MainActivityView>\n@Module\ninternal class MainScreenModule {\n- @Provides\n- @PerScreen\n- fun provideFragmentNavigator(activityProvider: ActivityProvider): FragmentNavigator = FragmentNavigator(activityProvider)\n-\n-\n- @Provides\n- @PerScreen\n- fun provideBaseMiddlewareDependency(\n- activityNavigator: ActivityNavigator,\n- schedulersProvider: SchedulersProvider,\n- fragmentNavigator: FragmentNavigator,\n- dialogNavigator: DialogNavigator,\n- errorHandler: ErrorHandler\n- ) = BaseNavMiddlewareDependency(activityNavigator, fragmentNavigator, dialogNavigator, schedulersProvider, errorHandler)\n-\n@Provides\n@PerScreen\nfun provideEventHub(\n- screenState: ScreenState,\n- screenEventDelegateManager: ScreenEventDelegateManager\n- ): BaseEventHub<MainEvent> = BaseEventHub(\n- screenState,\n- screenEventDelegateManager\n- ) { MainEvent.MainLifecycle(it) }\n+ screenEventHubDependency: ScreenEventHubDependency\n+ ): ScreenEventHub<MainEvent> =\n+ ScreenEventHub(screenEventHubDependency) { MainEvent.MainLifecycle(it) }\n@PerScreen\n@Provides\nfun provideBinder(\nbasePresenterDependency: BasePresenterDependency,\n- eventHub: BaseEventHub<MainEvent>,\n+ eventHub: ScreenEventHub<MainEvent>,\nmiddleware: MainMiddleware\n- ): Any = BaseBinder(basePresenterDependency)\n+ ): Any = ScreenBinder(basePresenterDependency)\n.apply { bind(eventHub, middleware) }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/simple_list/SimpleListActivityView.kt",
"new_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/simple_list/SimpleListActivityView.kt",
"diff": "@@ -3,14 +3,11 @@ package ru.surfstudio.android.core.mvi.sample.ui.screen.simple_list\nimport android.os.Bundle\nimport android.os.PersistableBundle\nimport kotlinx.android.synthetic.main.activity_simple_list.*\n-import ru.surfstudio.android.core.mvi.event.hub.RxEventHub\nimport ru.surfstudio.android.core.mvi.event.hub.owner.SingleHubOwner\nimport ru.surfstudio.android.core.mvi.sample.R\n-import ru.surfstudio.android.core.mvi.sample.ui.base.hub.BaseEventHub\n+import ru.surfstudio.android.core.mvi.sample.ui.base.hub.ScreenEventHub\nimport ru.surfstudio.android.core.mvi.sample.ui.screen.simple_list.controller.StepperButtonController\n-import ru.surfstudio.android.core.mvi.ui.BaseReactActivityView\nimport ru.surfstudio.android.core.mvp.binding.rx.ui.BaseRxActivityView\n-import ru.surfstudio.android.core.mvp.configurator.BaseActivityViewConfigurator\nimport ru.surfstudio.android.easyadapter.EasyAdapter\nimport ru.surfstudio.android.easyadapter.ItemList\nimport javax.inject.Inject\n@@ -22,7 +19,7 @@ import javax.inject.Inject\nclass SimpleListActivityView : BaseRxActivityView(), SingleHubOwner<SimpleListEvent> {\n@Inject\n- override lateinit var hub: BaseEventHub<SimpleListEvent>\n+ override lateinit var hub: ScreenEventHub<SimpleListEvent>\n@Inject\nlateinit var sh: SimpleListStateHolder\n"
},
{
"change_type": "MODIFY",
"old_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/simple_list/SimpleListScreenConfigurator.kt",
"new_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/simple_list/SimpleListScreenConfigurator.kt",
"diff": "@@ -5,16 +5,16 @@ import android.content.Intent\nimport dagger.Component\nimport dagger.Module\nimport dagger.Provides\n-import ru.surfstudio.android.core.mvi.sample.ui.base.binder.BaseBinder\n-import ru.surfstudio.android.core.mvi.sample.ui.base.hub.BaseEventHub\n+import ru.surfstudio.android.core.mvi.sample.ui.base.binder.ScreenBinder\n+import ru.surfstudio.android.core.mvi.sample.ui.base.di.ReactScreenModule\n+import ru.surfstudio.android.core.mvi.sample.ui.base.hub.ScreenEventHub\n+import ru.surfstudio.android.core.mvi.sample.ui.base.hub.dependency.ScreenEventHubDependency\nimport ru.surfstudio.android.core.mvi.sample.ui.base.middleware.dependency.BaseMiddlewareDependency\nimport ru.surfstudio.android.core.mvp.configurator.BindableScreenComponent\nimport ru.surfstudio.android.core.mvp.configurator.ScreenComponent\nimport ru.surfstudio.android.core.mvp.error.ErrorHandler\nimport ru.surfstudio.android.core.mvp.presenter.BasePresenterDependency\n-import ru.surfstudio.android.core.ui.event.ScreenEventDelegateManager\nimport ru.surfstudio.android.core.ui.navigation.activity.navigator.ActivityNavigator\n-import ru.surfstudio.android.core.ui.state.ScreenState\nimport ru.surfstudio.android.dagger.scope.PerScreen\nimport ru.surfstudio.android.rx.extension.scheduler.SchedulersProvider\nimport ru.surfstudio.android.sample.dagger.ui.base.configurator.DefaultActivityScreenConfigurator\n@@ -26,40 +26,29 @@ class SimpleListScreenConfigurator(intent: Intent) : DefaultActivityScreenConfig\n@PerScreen\n@Component(dependencies = [DefaultActivityComponent::class],\n- modules = [DefaultActivityScreenModule::class, SimpleListScreenModule::class])\n+ modules = [DefaultActivityScreenModule::class, SimpleListScreenModule::class, ReactScreenModule::class])\ninternal interface SimpleListScreenComponent\n: BindableScreenComponent<SimpleListActivityView>\n@Module\ninternal class SimpleListScreenModule(route: SimpleListActivityRoute) : DefaultCustomScreenModule<SimpleListActivityRoute>(route) {\n- @Provides\n- @PerScreen\n- fun provideBaseMiddlewareDependency(\n- activityNavigator: ActivityNavigator,\n- schedulersProvider: SchedulersProvider,\n- errorHandler: ErrorHandler\n- ) = BaseMiddlewareDependency(activityNavigator, schedulersProvider, errorHandler)\n-\n@Provides\n@PerScreen\nfun provideEventHub(\n- screenState: ScreenState,\n- screenEventDelegateManager: ScreenEventDelegateManager\n- ): BaseEventHub<SimpleListEvent> = BaseEventHub(\n- screenState,\n- screenEventDelegateManager\n- ) { SimpleListEvent.SimpleListLifecycle(it) }\n+ screenEventHubDependency: ScreenEventHubDependency\n+ ): ScreenEventHub<SimpleListEvent> =\n+ ScreenEventHub(screenEventHubDependency) { SimpleListEvent.SimpleListLifecycle(it) }\n@PerScreen\n@Provides\nfun provideBinder(\nbasePresenterDependency: BasePresenterDependency,\n- eventHub: BaseEventHub<SimpleListEvent>,\n+ eventHub: ScreenEventHub<SimpleListEvent>,\nmiddleware: SimpleListMiddleware,\nreactor: SimpleListReactor,\nstateHolder: SimpleListStateHolder\n- ): Any = BaseBinder(basePresenterDependency)\n+ ): Any = ScreenBinder(basePresenterDependency)\n.apply { bind(eventHub, middleware, stateHolder, reactor) }\n}\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-671 Add React screen module + refactor names |
652,316 | 20.09.2019 14:04:32 | -10,800 | 9afa5ec5c2211df59ae941ed11b0887c694a23cd | Add live templates for mvi | [
{
"change_type": "RENAME",
"old_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/base/adapter/PaginationableAdapter.kt",
"new_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/adapter/PaginationableAdapter.kt",
"diff": "* limitations under the License.\n*/\n-package ru.surfstudio.android.core.mvi.sample.ui.base.adapter\n+package ru.surfstudio.android.core.mvi.sample.ui.adapter\nimport android.view.View\nimport android.view.View.GONE\n"
},
{
"change_type": "MODIFY",
"old_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/list/ComplexListActivityView.kt",
"new_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/list/ComplexListActivityView.kt",
"diff": "@@ -14,7 +14,7 @@ import ru.surfstudio.android.easyadapter.ItemList\nimport ru.surfstudio.android.easyadapter.pagination.PaginationState\nimport ru.surfstudio.android.core.mvi.sample.ui.screen.list.controller.ComplexListController\nimport ru.surfstudio.android.core.mvi.sample.ui.base.hub.ScreenEventHub\n-import ru.surfstudio.android.core.mvi.sample.ui.base.adapter.PaginationableAdapter\n+import ru.surfstudio.android.core.mvi.sample.ui.adapter.PaginationableAdapter\nimport ru.surfstudio.android.core.mvi.sample.ui.base.extension.observeMainLoading\nimport ru.surfstudio.android.core.mvi.sample.ui.base.extension.observeSwrLoading\nimport javax.inject.Inject\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "core-mvi/sample/templates/core-mvi.xml",
"diff": "+<templateSet group=\"core-mvi\">\n+ <template name=\"roe\" description=\"Reacts on Event\" toReformat=\"false\" toShortenFQNames=\"true\"\n+ value=\"is $EVENT_TYPE$ -> on$EVENT_TYPE$Event$END$(holder, event)\">\n+ <context>\n+ <option name=\"KOTLIN_EXPRESSION\" value=\"true\" />\n+ <option name=\"KOTLIN_STATEMENT\" value=\"true\" />\n+ </context>\n+ <variable name=\"EVENT_TYPE\" alwaysStopAt=\"true\" defaultValue=\"\" expression=\"\" />\n+ </template>\n+ <template name=\"tre\" description=\"Transform Event\" toReformat=\"false\" toShortenFQNames=\"true\"\n+ value=\"is $EVENT_TYPE$ -> transform$EVENT_TYPE$Event$END$(event)\">\n+ <context>\n+ <option name=\"KOTLIN\" value=\"true\" />\n+ </context>\n+ <variable name=\"EVENT_TYPE\" alwaysStopAt=\"true\" defaultValue=\"\" expression=\"\" />\n+ </template>\n+ <template name=\"genev\" description=\"Generate Event Class\" toReformat=\"false\"\n+ toShortenFQNames=\"true\"\n+ value=\"sealed class $EVENT_NAME$Event: ru.surfstudio.android.core.mvi.event.Event { data class $EVENT_NAME$Lifecycle( override var stage: ru.surfstudio.android.core.ui.state.LifecycleStage ): $EVENT_NAME$Event(), ru.surfstudio.android.core.mvi.event.lifecycle.LifecycleEvent } \">\n+ <context>\n+ <option name=\"KOTLIN_TOPLEVEL\" value=\"true\" />\n+ </context>\n+ <variable name=\"EVENT_NAME\" alwaysStopAt=\"true\" defaultValue=\"\" expression=\"\" />\n+ </template>\n+ <template name=\"gennavmw\" description=\"Generate base navigation middleware\" toReformat=\"false\"\n+ toShortenFQNames=\"true\"\n+ value=\"@ru.surfstudio.android.dagger.scope.PerScreen class $PREFIX$Middleware @javax.inject.Inject constructor( baseMiddlewareDependency: ru.surfstudio.android.core.mvi.sample.ui.base.middleware.dependency.BaseNavMiddlewareDependency ) : ru.surfstudio.android.core.mvi.sample.ui.base.middleware.BaseNavMiddleware<$PREFIX$Event>(baseMiddlewareDependency) { override fun transform(eventStream: io.reactivex.Observable<$PREFIX$Event>) = transformations(eventStream) { $END$ } }\">\n+ <context>\n+ <option name=\"KOTLIN_TOPLEVEL\" value=\"true\" />\n+ </context>\n+ <variable name=\"PREFIX\" alwaysStopAt=\"true\" defaultValue=\"\" expression=\"\" />\n+ </template>\n+ <template name=\"genbasemw\" description=\"Generate base navigation middleware\" toReformat=\"false\"\n+ toShortenFQNames=\"true\"\n+ value=\"@ru.surfstudio.android.dagger.scope.PerScreen class $PREFIX$Middleware @javax.inject.Inject constructor( baseMiddlewareDependency: ru.surfstudio.android.core.mvi.sample.ui.base.middleware.dependency.BaseMiddlewareDependency ) : ru.surfstudio.android.core.mvi.sample.ui.base.middleware.BaseMiddleware<$PREFIX$Event>(baseMiddlewareDependency) { override fun transform(eventStream: io.reactivex.Observable<$PREFIX$Event>) = transformations(eventStream) { $END$ } }\">\n+ <context>\n+ <option name=\"KOTLIN_TOPLEVEL\" value=\"true\" />\n+ </context>\n+ <variable name=\"PREFIX\" alwaysStopAt=\"true\" defaultValue=\"\" expression=\"\" />\n+ </template>\n+ <template name=\"genmapmw\" description=\"Generate base navigation middleware\" toReformat=\"false\"\n+ toShortenFQNames=\"true\"\n+ value=\"@ru.surfstudio.android.dagger.scope.PerScreen class $PREFIX$Middleware @javax.inject.Inject constructor( baseMiddlewareDependency: ru.surfstudio.android.core.mvi.sample.ui.base.middleware.dependency.BaseMiddlewareDependency ) : ru.surfstudio.android.core.mvi.sample.ui.base.middleware.BaseMapMiddleware<$PREFIX$Event>(baseMiddlewareDependency) { override fun flatMap(event: $PREFIX$Event): io.reactivex.Observable<out $PREFIX$Event> = when (event) { $END$ else -> skip() } }\">\n+ <context>\n+ <option name=\"KOTLIN_TOPLEVEL\" value=\"true\" />\n+ </context>\n+ <variable name=\"PREFIX\" alwaysStopAt=\"true\" defaultValue=\"\" expression=\"\" />\n+ </template>\n+ <template name=\"providedep\" description=\"Provide dependencies for mvi\" toReformat=\"false\"\n+ toShortenFQNames=\"true\"\n+ value=\" @dagger.Provides @PerScreen fun provideEventHub( screenEventHubDependency: ru.surfstudio.android.core.mvi.sample.ui.base.hub.dependency.ScreenEventHubDependency ) = ru.surfstudio.android.core.mvi.sample.ui.base.hub.ScreenEventHub<$PREFIX$Event>(screenEventHubDependency, $PREFIX$Event::$PREFIX$Lifecycle) @Provides @PerScreen fun provideBinder( basePresenterDependency: ru.surfstudio.android.core.mvp.presenter.BasePresenterDependency, eventHub: ru.surfstudio.android.core.mvi.sample.ui.base.hub.ScreenEventHub<$PREFIX$Event>, middleware: $PREFIX$Middleware, sh: $PREFIX$StateHolder, reactor: $PREFIX$Reactor ): Any = ru.surfstudio.android.core.mvi.sample.ui.base.binder.ScreenBinder(basePresenterDependency).apply { bind(eventHub, middleware, sh, reactor) } \">\n+ <context>\n+ <option name=\"KOTLIN_CLASS\" value=\"true\" />\n+ </context>\n+ <variable name=\"PREFIX\" alwaysStopAt=\"true\" defaultValue=\"\" expression=\"\" />\n+ </template>\n+ <template name=\"genreactor\" description=\"Generate reactor and holder\" toReformat=\"false\"\n+ toShortenFQNames=\"true\"\n+ value=\" @ru.surfstudio.android.dagger.scope.PerScreen class $PREFIX$StateHolder @javax.inject.Inject constructor() { } @ru.surfstudio.android.dagger.scope.PerScreen class $PREFIX$Reactor @javax.inject.Inject constructor() : ru.surfstudio.android.core.mvi.ui.reactor.Reactor<$PREFIX$Event, $PREFIX$StateHolder> { override fun react(holder: $PREFIX$StateHolder, event: $PREFIX$Event) { when (event) { $END$ } } }\">\n+ <context>\n+ <option name=\"KOTLIN_TOPLEVEL\" value=\"true\" />\n+ </context>\n+ <variable name=\"PREFIX\" alwaysStopAt=\"true\" defaultValue=\"\" expression=\"\" />\n+ </template>\n+</templateSet>\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-671 Add live templates for mvi |
652,322 | 23.09.2019 13:36:22 | -10,800 | 3e98df7b7e444bf800361d472c3353d6e6e1a81e | Fix several CI bugs | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/GenerateModuleNameFileTask.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/GenerateModuleNameFileTask.kt",
"diff": "@@ -19,8 +19,7 @@ open class GenerateModuleNameFileTask : DefaultTask() {\n@TaskAction\nfun generate() {\n- val gson = GsonBuilder().create()\n- val moduleNames = (Components.value.flatMap { it.libraries }.map { library -> \"${library.name}\" })\n+ val moduleNames = (Components.value.flatMap { it.libraries }.map { it.name })\nFile(\"$OUTPUT_DIR/$FILE_NAME\").writeText(GsonBuilder().create().toJson(moduleNames))\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/GitDiffManager.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/GitDiffManager.kt",
"diff": "@@ -4,6 +4,7 @@ import org.apache.commons.io.FileUtils\nimport org.eclipse.jgit.diff.DiffEntry\nimport ru.surfstudio.android.build.tasks.deploy_to_mirror.repository.MirrorRepository\nimport java.io.File\n+import java.io.FileNotFoundException\n/**\n* Work with git changes\n@@ -47,11 +48,15 @@ class GitDiffManager(\n* @param diffEntry information about diff\n*/\nfun delete(diffEntry: DiffEntry) {\n+ try {\nval file = mirrorPath(diffEntry.oldPath)\nFileUtils.forceDelete(file)\nmirrorRepository.addToIndex(file.path)\n+ } catch (ignored: FileNotFoundException) {\n+\n+ }\n}\n/**\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/GitTree.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/GitTree.kt",
"diff": "@@ -69,7 +69,7 @@ class GitTree(\nfun getParent(commit: CommitWithBranch): CommitWithBranch {\nval node = standardNodes.find { it.value == commit.commit }\n?: throw GitNodeNotFoundException(commit.commit)\n- return standardRepositoryCommitsForMirror.find { it.commit == node.parents.first().value }\n+ return standardRepositoryCommitsForMirror.find { it.commit == node.parents.firstOrNull()?.value }\n?: throw GitNodeNotFoundException(node.value)\n}\n@@ -285,11 +285,15 @@ class GitTree(\nval branchName = BranchCreator.generateBranchName(existedBranchNames)\nline.forEach { node ->\nval commit = standardRepositoryCommitsForMirror.find { it.commit == node.value }\n- if (commit?.branch?.isEmpty() == true) commit.branch = branchName\n+ if (commit?.branch?.isEmpty() == true) {\n+ commit.branch = branchName\n}\n}\n}\n+ standardRepositoryCommitsForMirror = standardRepositoryCommitsForMirror.filter { it.branch.isNotEmpty() }\n+ }\n+\n/**\n* creates chain recursively\n*/\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/MirrorManager.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/MirrorManager.kt",
"diff": "@@ -157,12 +157,12 @@ class MirrorManager(\nval mainBranch = commit.branch\nval secondBranch = gitTree.getMergeParents(commit)\n.map(CommitWithBranch::branch)\n- .first { it != mainBranch }\n+ .firstOrNull { it != mainBranch }\n+ ?: return null\nif (!mirrorRepository.isBranchExists(mainBranch) || !mirrorRepository.isBranchExists(secondBranch)) return null\nmirrorRepository.checkoutBranch(mainBranch)\n-\nval conflicts = mirrorRepository.merge(secondBranch)\nconflicts.forEach {\nval filePath = it.replaceFirst(\"${mirrorRepository.repositoryPath.path}/\", EMPTY_STRING)\n"
},
{
"change_type": "MODIFY",
"old_path": "ci-internal/JenkinsfilePullRequestJob.groovy",
"new_path": "ci-internal/JenkinsfilePullRequestJob.groovy",
"diff": "@@ -232,7 +232,7 @@ pipeline.stages = [\n}\nif (!checksPassed) {\n- throw RuntimeException(\"Checks Failed, see reason above ^^^\")\n+ throw script.error(\"Checks Failed, see reason above ^^^\")\n}\n},\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-728 Fix several CI bugs |
652,322 | 24.09.2019 14:56:21 | -10,800 | 49e64b8c9b702119e613a608147a55c97e9c3b1b | Gradle task for checking cyrillic symbols in RELEASE_NOTES | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/buildTasks.gradle",
"new_path": "buildSrc/buildTasks.gradle",
"diff": "@@ -59,6 +59,8 @@ task incrementProjectSnapshotVersion(type: IncrementProjectSnapshotVersionTask)\ntask checkReleaseNotesContainCurrentVersion(type: CheckReleaseNotesContainCurrentVersion) //pr //release\n+task checkReleaseNotesNotContainCyrillic(type: CheckReleaseNotesNotContainCyrillic) //pr //release\n+\ntask checkStableArtifactsExistInArtifactoryTask(type: CheckStableArtifactsExistInArtifactoryTask) //pr\ntask checkStableArtifactsExistInBintrayTask(type: CheckStableArtifactsExistInBintrayTask) //pr\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/exceptions/release_notes/ReleaseNotesContainsCyrillicException.kt",
"diff": "+package ru.surfstudio.android.build.exceptions.release_notes\n+\n+import org.gradle.api.GradleException\n+import ru.surfstudio.android.build.model.release_notes.ReleaseNotesInfo\n+\n+class ReleaseNotesContainsCyrillicException(\n+ releaseNotes: ReleaseNotesInfo\n+) : GradleException(\n+ \"Release notes \\\"${releaseNotes.title}\\\" contains cyrillic symbols\"\n+)\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/CheckReleaseNotesNotContainCyrillic.kt",
"diff": "+package ru.surfstudio.android.build.tasks\n+\n+import org.gradle.api.DefaultTask\n+import org.gradle.api.tasks.TaskAction\n+import ru.surfstudio.android.build.Components\n+import ru.surfstudio.android.build.ReleaseNotes\n+import ru.surfstudio.android.build.exceptions.release_notes.ReleaseNotesContainsCyrillicException\n+import ru.surfstudio.android.build.model.release_notes.ReleaseNotesInfo\n+import java.util.regex.Pattern\n+\n+\n+/**\n+ * Check ReleaseNotes does not contain cyrillic symbols\n+ */\n+open class CheckReleaseNotesNotContainCyrillic : DefaultTask() {\n+\n+ @TaskAction\n+ fun check() {\n+\n+ Components.value.forEach { component ->\n+ val releaseNotes: ReleaseNotesInfo = ReleaseNotes.findByComponentName(component.name)\n+\n+ if (releaseNotes.title.hasCyrillic || releaseNotes.versions.any { version ->\n+ version.version.hasCyrillic || version.libraries.any { library ->\n+ library.name.hasCyrillic || library.items.any { item ->\n+ item.content.hasCyrillic\n+ }\n+ }\n+ }\n+ ) {\n+ throw ReleaseNotesContainsCyrillicException(releaseNotes)\n+ }\n+ }\n+ }\n+\n+ private val String.hasCyrillic: Boolean get() = find {\n+ val block = Character.UnicodeBlock.of(it)\n+ block == Character.UnicodeBlock.CYRILLIC\n+ || block == Character.UnicodeBlock.CYRILLIC_SUPPLEMENTARY\n+ || block == Character.UnicodeBlock.CYRILLIC_EXTENDED_A\n+ || block == Character.UnicodeBlock.CYRILLIC_EXTENDED_B\n+ } != null\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "ci-internal/JenkinsfilePullRequestJob.groovy",
"new_path": "ci-internal/JenkinsfilePullRequestJob.groovy",
"diff": "@@ -202,6 +202,7 @@ pipeline.stages = [\n},\npipeline.stage(CHECK_RELEASE_NOTES_VALID, StageStrategy.UNSTABLE_WHEN_STAGE_ERROR) {\nscript.sh(\"./gradlew checkReleaseNotesContainCurrentVersion\")\n+ script.sh(\"./gradlew checkReleaseNotesNotContainCyrillic\")\n},\npipeline.stage(CHECK_RELEASE_NOTES_CHANGED, StageStrategy.UNSTABLE_WHEN_STAGE_ERROR) {\nscript.sh(\"./gradlew checkReleaseNotesChanged -PrevisionToCompare=${lastDestinationBranchCommitHash}\")\n"
},
{
"change_type": "MODIFY",
"old_path": "ci-internal/ReleaseDeployJobJenkinsfile.groovy",
"new_path": "ci-internal/ReleaseDeployJobJenkinsfile.groovy",
"diff": "@@ -145,6 +145,7 @@ pipeline.stages = [\n},\npipeline.stage(CHECK_RELEASE_NOTES_VALID, StageStrategy.UNSTABLE_WHEN_STAGE_ERROR) {\nscript.sh(\"./gradlew checkReleaseNotesContainCurrentVersion\")\n+ script.sh(\"./gradlew checkReleaseNotesNotContainCyrillic\")\n},\npipeline.stage(CHECKS_RESULT) {\ndef checksPassed = true\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-737 Gradle task for checking cyrillic symbols in RELEASE_NOTES |
652,322 | 24.09.2019 15:52:25 | -10,800 | ebe9f52e55c268bd5fa2460a657a162ded4b2837 | fix printTestInstrumentationRunnerName | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/androidModule.gradle",
"new_path": "buildSrc/androidModule.gradle",
"diff": "@@ -57,3 +57,9 @@ configurations.all {\n}\n}\n}\n+\n+task printTestInstrumentationRunnerName {\n+ doLast {\n+ println \"$android.defaultConfig.testInstrumentationRunner\"\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/androidSample.gradle",
"new_path": "buildSrc/androidSample.gradle",
"diff": "@@ -53,3 +53,9 @@ dependencies {\nDependencyConfigurator.projectAndroidTestImplementation(project, \"sample-common\")\n}\n+\n+task printTestInstrumentationRunnerName {\n+ doLast {\n+ println \"$android.defaultConfig.testInstrumentationRunner\"\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/baseBuild.gradle",
"new_path": "buildSrc/baseBuild.gradle",
"diff": "@@ -4,9 +4,3 @@ apply from: \"$rootDir/buildSrc/androidModule.gradle\"\nDependencyConfigurator.configure(project)\nconfigureDeploy(this)\n\\ No newline at end of file\n-\n-task printTestInstrumentationRunnerName {\n- doLast {\n- println \"$android.defaultConfig.testInstrumentationRunner\"\n- }\n-}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | fix printTestInstrumentationRunnerName |
652,322 | 26.09.2019 12:24:09 | -10,800 | dbd59ae9477aa2206d35dda16584bb1649ffdb06 | Assemble mirror component | [
{
"change_type": "MODIFY",
"old_path": ".gitignore",
"new_path": ".gitignore",
"diff": "buildSrc/modules.json\n.externalNativeBuild\n/temp\n-.mirror\n\\ No newline at end of file\n+_mirror\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/components.json",
"new_path": "buildSrc/components.json",
"diff": "\"dir\": \"sample\"\n}\n],\n- \"has_mirror\": true,\n- \"mirror_repo\": \"https://github.com/surfstudio/Core-ui\"\n+ \"has_mirror\": false,\n+ \"mirror_repo\": \"\"\n},\n{\n\"id\": \"custom-view\",\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/DependencyConfigurator.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/DependencyConfigurator.kt",
"diff": "@@ -51,7 +51,7 @@ object DependencyConfigurator {\n*/\n@JvmStatic\nfun projectImplementation(project: Project, dependencyName: String) {\n- if (GradlePropertiesManager.isCurrentComponentAMirror() && !isProjectIncluded(project, dependencyName)) {\n+ if (GradlePropertiesManager.isCurrentComponentAMirror() || !isProjectIncluded(project, dependencyName)) {\naddDependency(project, IMPLEMENTATION_DEP_TYPE, getDependencyArtifactoryName(dependencyName))\n} else {\naddDependency(project, IMPLEMENTATION_DEP_TYPE, project.rootProject.project(dependencyName))\n@@ -68,7 +68,7 @@ object DependencyConfigurator {\n*/\n@JvmStatic\nfun projectTestImplementation(project: Project, dependencyName: String) {\n- if (GradlePropertiesManager.isCurrentComponentAMirror() && !isProjectIncluded(project, dependencyName)) {\n+ if (GradlePropertiesManager.isCurrentComponentAMirror() || !isProjectIncluded(project, dependencyName)) {\naddDependency(project, TEST_IMPLEMENTATION_DEP_TYPE, getDependencyArtifactoryName(dependencyName))\n} else {\naddDependency(project, TEST_IMPLEMENTATION_DEP_TYPE, project.rootProject.project(dependencyName))\n@@ -85,7 +85,7 @@ object DependencyConfigurator {\n*/\n@JvmStatic\nfun projectAndroidTestImplementation(project: Project, dependencyName: String) {\n- if (GradlePropertiesManager.isCurrentComponentAMirror() && !isProjectIncluded(project, dependencyName)) {\n+ if (GradlePropertiesManager.isCurrentComponentAMirror() || !isProjectIncluded(project, dependencyName)) {\naddDependency(project, ANDROID_TEST_IMPLEMENTATION_DEP_TYPE, getDependencyArtifactoryName(dependencyName))\n} else {\naddDependency(project, ANDROID_TEST_IMPLEMENTATION_DEP_TYPE, project.rootProject.project(dependencyName))\n@@ -188,7 +188,7 @@ object DependencyConfigurator {\nprivate fun addAndroidStandardDependencies(project: Project, dependencies: List<Dependency>) {\ndependencies.forEach {\n- if (GradlePropertiesManager.isCurrentComponentAMirror() && !isProjectIncluded(project, it.name)) {\n+ if (GradlePropertiesManager.isCurrentComponentAMirror() || !isProjectIncluded(project, it.name)) {\naddDependency(project, IMPLEMENTATION_DEP_TYPE, getDependencyArtifactoryName(it.name))\n} else {\naddDependency(project, IMPLEMENTATION_DEP_TYPE, project.rootProject.project(\":${it.name}\"))\n"
},
{
"change_type": "MODIFY",
"old_path": "ci-internal/ComponentMirroringJobJenkinsfile.groovy",
"new_path": "ci-internal/ComponentMirroringJobJenkinsfile.groovy",
"diff": "@@ -11,9 +11,10 @@ import ru.surfstudio.ci.stage.StageStrategy\ndef CHECKOUT = 'Checkout'\ndef PREPARE_MIRRORING = 'Prepare Mirroring'\ndef MIRROR_COMPONENT = 'Mirror Component'\n+def ASSEMBLE_COMPONENT = 'Assemble Component'\n//constants\n-def MIRROR_FOLDER = \".mirror\"\n+def MIRROR_FOLDER = \"_mirror\"\ndef STANDARD_REPO_FOLDER = \"temp\"\ndef DEPTH_LIMIT = 100\ndef SEARCH_LIMIT = 100\n@@ -102,6 +103,13 @@ pipeline.stages = [\n}\n}\n)\n+ pipeline.stages.add(\n+ pipeline.stage(\"$ASSEMBLE_COMPONENT : ${component.id}\", StageStrategy.UNSTABLE_WHEN_STAGE_ERROR) {\n+ script.sh \"cd $MIRROR_FOLDER\"\n+ script.sh \"./gradlew clean assemble\"\n+ script.sh \"cd ..-\"\n+ }\n+ )\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "template/.gitignore",
"new_path": "template/.gitignore",
"diff": "/captures\n.externalNativeBuild\n/temp\n-.mirror\n\\ No newline at end of file\n+_mirror\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-743 Assemble mirror component |
652,316 | 27.09.2019 18:37:30 | -10,800 | 23d5962d1898c14233822822e1de86cb9ec55822 | Navigator middleware fix | [
{
"change_type": "MODIFY",
"old_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/base/middleware/experimental/navigation/NavigatorMiddleware.kt",
"new_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/base/middleware/experimental/navigation/NavigatorMiddleware.kt",
"diff": "@@ -48,13 +48,14 @@ interface NavigatorMiddleware<T : Event> : RxMiddleware<T> {\n}\nactivityNavigator.start(route)\n}\n- is FragmentRoute -> {\n- fragmentNavigator.add(route, true, TRANSIT_FRAGMENT_OPEN)\n- }\nis DialogRoute -> {\ndialogNavigator.show(route)\n}\n+\n+ is FragmentRoute -> {\n+ fragmentNavigator.add(route, true, TRANSIT_FRAGMENT_OPEN)\n+ }\n}\n}\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-671 Navigator middleware fix |
652,316 | 30.09.2019 15:10:30 | -10,800 | b0ae0b072b2a7dc193c3211fe4d6f69ba515efec | Add close with affinity event | [
{
"change_type": "MODIFY",
"old_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/base/middleware/experimental/navigation/NavigatorMiddleware.kt",
"new_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/base/middleware/experimental/navigation/NavigatorMiddleware.kt",
"diff": "@@ -6,8 +6,8 @@ import io.reactivex.Observable\nimport ru.surfstudio.android.core.mvi.event.Event\nimport ru.surfstudio.android.core.mvi.sample.ui.base.middleware.experimental.ExperimentalFeature\nimport ru.surfstudio.android.core.mvi.sample.ui.base.middleware.experimental.navigation.close.*\n-import ru.surfstudio.android.core.mvi.ui.middleware.dsl.EventTransformerList\nimport ru.surfstudio.android.core.mvi.ui.middleware.RxMiddleware\n+import ru.surfstudio.android.core.mvi.ui.middleware.dsl.EventTransformerList\nimport ru.surfstudio.android.core.mvi.util.filterIsInstance\nimport ru.surfstudio.android.core.ui.event.result.SupportOnActivityResultRoute\nimport ru.surfstudio.android.core.ui.navigation.ScreenResult\n@@ -68,6 +68,8 @@ interface NavigatorMiddleware<T : Event> : RxMiddleware<T> {\nwhen (event) {\nis CloseActivityEvent ->\nactivityNavigator.finishCurrent()\n+ is CloseAffinityEvent ->\n+ activityNavigator.finishAffinity()\nis CloseWithResultEvent<*> -> {\nval resultRoute = event.route as SupportOnActivityResultRoute<Serializable>\nactivityNavigator.finishWithResult(resultRoute, event.result, event.isSuccess)\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-671 Add close with affinity event |
652,316 | 02.10.2019 13:08:03 | -10,800 | 928ebcd0d26edc1bcceae8332b265c1f1d0c77d3 | Sample refactor | [
{
"change_type": "MODIFY",
"old_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/base/extension/MappingExtensions.kt",
"new_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/base/extension/MappingExtensions.kt",
"diff": "@@ -2,8 +2,8 @@ package ru.surfstudio.android.core.mvi.sample.ui.base.extension\nimport ru.surfstudio.android.core.mvp.binding.rx.extensions.Optional\nimport ru.surfstudio.android.core.mvp.binding.rx.extensions.toOptional\n-import ru.surfstudio.android.core.mvp.binding.rx.response.data.*\n-import ru.surfstudio.android.core.mvp.binding.rx.response.type.Request\n+import ru.surfstudio.android.core.mvp.binding.rx.request.data.*\n+import ru.surfstudio.android.core.mvp.binding.rx.request.type.Request\nimport ru.surfstudio.android.datalistpagecount.domain.datalist.DataList\nfun <T> mapLoading(type: Request<T>, hasData: Boolean, isSwr: Boolean = false): Loading {\n"
},
{
"change_type": "MODIFY",
"old_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/base/extension/PaginationExtensions.kt",
"new_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/base/extension/PaginationExtensions.kt",
"diff": "@@ -3,8 +3,8 @@ package ru.surfstudio.android.core.mvi.sample.ui.base.extension\nimport io.reactivex.Observable\nimport ru.surfstudio.android.core.mvi.event.RequestEvent\nimport ru.surfstudio.android.core.mvi.sample.ui.base.middleware.experimental.pagination.PaginationEvent\n-import ru.surfstudio.android.core.mvp.binding.rx.response.state.RequestState\n-import ru.surfstudio.android.core.mvp.binding.rx.response.type.Request\n+import ru.surfstudio.android.core.mvp.binding.rx.request.state.RequestState\n+import ru.surfstudio.android.core.mvp.binding.rx.request.type.Request\nimport ru.surfstudio.android.datalistpagecount.domain.datalist.DataList\nimport ru.surfstudio.android.easyadapter.pagination.PaginationState\nimport ru.surfstudio.android.rx.extension.toObservable\n"
},
{
"change_type": "MODIFY",
"old_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/input/InputFormMiddleware.kt",
"new_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/input/InputFormMiddleware.kt",
"diff": "@@ -18,7 +18,9 @@ class InputFormMiddleware @Inject constructor(\n) : BaseNavMiddleware<InputFormEvent>(baseNavMiddlewareDependency) {\noverride fun transform(eventStream: Observable<InputFormEvent>) = transformations(eventStream) {\n- +eventStream.mapNavigationAuto()\n- +map<SubmitClicked> { InputFormClosed(InputFormActivityRoute(), sh.inputString.value) }\n+ addAll(\n+ eventStream.mapNavigationAuto(),\n+ SubmitClicked::class mapTo { InputFormClosed(InputFormActivityRoute(), sh.inputString.value) }\n+ )\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/list/ComplexListEvent.kt",
"new_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/list/ComplexListEvent.kt",
"diff": "@@ -3,7 +3,7 @@ package ru.surfstudio.android.core.mvi.sample.ui.screen.list\nimport ru.surfstudio.android.core.mvi.event.*\nimport ru.surfstudio.android.core.mvi.event.lifecycle.LifecycleEvent\nimport ru.surfstudio.android.core.mvi.sample.ui.base.middleware.experimental.pagination.PaginationEvent\n-import ru.surfstudio.android.core.mvp.binding.rx.response.type.Request\n+import ru.surfstudio.android.core.mvp.binding.rx.request.type.Request\nimport ru.surfstudio.android.core.ui.state.LifecycleStage\nimport ru.surfstudio.android.datalistpagecount.domain.datalist.DataList\nimport ru.surfstudio.android.easyadapter.pagination.PaginationState\n"
},
{
"change_type": "MODIFY",
"old_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/list/ComplexListMiddleware.kt",
"new_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/list/ComplexListMiddleware.kt",
"diff": "@@ -25,25 +25,6 @@ class ComplexListMiddleware @Inject constructor(\nPaginationMiddleware<ComplexListEvent> {\noverride fun transform(eventStream: Observable<ComplexListEvent>): Observable<out ComplexListEvent> {\n- transformations(eventStream) {\n-// +onCreate().eventMap { loadData() }\n-// +eventMap<SwipeRefresh> { loadData(isSwr = true) }\n-// +eventMap<LoadNextPage> { loadData(sh.list.data.nextPage) }\n-// +mapPagination(FilterNumbers()) { sh.list.canGetMore() }\n-// +map<QueryChangedDebounced> { FilterNumbers() }\n-// +eventMap<Reload> { loadData() }\n-// +eventStream.ofType<QueryChanged>().streamMap(::debounceQuery)\n-//\n-//\n-// +onCreate().eventMap { loadData() }\n-// +mapPagination(FilterNumbers()) { sh.list.canGetMore() }\n-// +(SwipeRefresh::class eventMapTo { loadData(isSwr = true) })\n-// +(LoadNextPage::class eventMapTo { loadData(sh.list.data.nextPage) })\n-// +(Reload::class eventMapTo { loadData() })\n-// +(QueryChanged::class streamMapTo (::debounceQuery))\n-// +(QueryChangedDebounced::class mapTo { FilterNumbers() })\n- }\n-\nreturn transformations(eventStream) {\naddAll(\nonCreate() eventMap { loadData() },\n"
},
{
"change_type": "MODIFY",
"old_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/list/ComplexListReactor.kt",
"new_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/list/ComplexListReactor.kt",
"diff": "@@ -6,7 +6,7 @@ import ru.surfstudio.android.core.mvi.sample.ui.base.extension.mapLoading\nimport ru.surfstudio.android.core.mvi.sample.ui.screen.list.ComplexListEvent.*\nimport ru.surfstudio.android.core.mvi.ui.reactor.Reactor\nimport ru.surfstudio.android.core.mvp.binding.rx.relation.mvp.State\n-import ru.surfstudio.android.core.mvp.binding.rx.response.state.RequestState\n+import ru.surfstudio.android.core.mvp.binding.rx.request.state.RequestState\nimport ru.surfstudio.android.dagger.scope.PerScreen\nimport ru.surfstudio.android.datalistpagecount.domain.datalist.DataList\nimport ru.surfstudio.android.easyadapter.pagination.PaginationState\n"
},
{
"change_type": "RENAME",
"old_path": "core-mvp-binding/lib-core-mvp-binding/src/main/java/ru/surfstudio/android/core/mvp/binding/rx/response/data/EmptyErrorException.kt",
"new_path": "core-mvp-binding/lib-core-mvp-binding/src/main/java/ru/surfstudio/android/core/mvp/binding/rx/request/data/EmptyErrorException.kt",
"diff": "-package ru.surfstudio.android.core.mvp.binding.rx.response.data\n+package ru.surfstudio.android.core.mvp.binding.rx.request.data\nimport java.lang.Exception\n"
},
{
"change_type": "RENAME",
"old_path": "core-mvp-binding/lib-core-mvp-binding/src/main/java/ru/surfstudio/android/core/mvp/binding/rx/response/data/ResponseUi.kt",
"new_path": "core-mvp-binding/lib-core-mvp-binding/src/main/java/ru/surfstudio/android/core/mvp/binding/rx/request/data/ResponseUi.kt",
"diff": "-package ru.surfstudio.android.core.mvp.binding.rx.response.data\n+package ru.surfstudio.android.core.mvp.binding.rx.request.data\nimport ru.surfstudio.android.core.mvp.binding.rx.extensions.Optional\n"
},
{
"change_type": "RENAME",
"old_path": "core-mvp-binding/lib-core-mvp-binding/src/main/java/ru/surfstudio/android/core/mvp/binding/rx/response/state/RequestState.kt",
"new_path": "core-mvp-binding/lib-core-mvp-binding/src/main/java/ru/surfstudio/android/core/mvp/binding/rx/request/state/RequestState.kt",
"diff": "-package ru.surfstudio.android.core.mvp.binding.rx.response.state\n+package ru.surfstudio.android.core.mvp.binding.rx.request.state\nimport io.reactivex.Observable\nimport ru.surfstudio.android.core.mvp.binding.rx.extensions.toOptional\n-import ru.surfstudio.android.core.mvp.binding.rx.response.data.ResponseUi\n-import ru.surfstudio.android.core.mvp.binding.rx.response.data.Loading\n+import ru.surfstudio.android.core.mvp.binding.rx.request.data.ResponseUi\n+import ru.surfstudio.android.core.mvp.binding.rx.request.data.Loading\nimport ru.surfstudio.android.core.mvp.binding.rx.extensions.filterValue\nimport ru.surfstudio.android.core.mvp.binding.rx.relation.BehaviorRelation\nimport ru.surfstudio.android.core.mvp.binding.rx.relation.mvp.PRESENTER\n"
},
{
"change_type": "RENAME",
"old_path": "core-mvp-binding/lib-core-mvp-binding/src/main/java/ru/surfstudio/android/core/mvp/binding/rx/response/type/Request.kt",
"new_path": "core-mvp-binding/lib-core-mvp-binding/src/main/java/ru/surfstudio/android/core/mvp/binding/rx/request/type/Request.kt",
"diff": "-package ru.surfstudio.android.core.mvp.binding.rx.response.type\n+package ru.surfstudio.android.core.mvp.binding.rx.request.type\nimport io.reactivex.Observable\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-671 Sample refactor |
652,316 | 02.10.2019 13:42:03 | -10,800 | b8e8dc5be3914c31e59b853d7c188e259a876e32 | Add stream transformers | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "core-mvi/lib-core-mvi/src/main/java/ru/surfstudio/android/core/mvi/ui/middleware/dsl/transformers/EventMapTransformer.kt",
"diff": "+package ru.surfstudio.android.core.mvi.ui.middleware.dsl.transformers\n+\n+import io.reactivex.Observable\n+\n+class EventMapTransformer<T, E>(\n+ private val mapper: (T) -> Observable<out E>\n+) : StreamTransformer<T, E> {\n+\n+ override fun map(stream: Observable<T>): Observable<out E> {\n+ return stream.flatMap { mapper(it) }\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "core-mvi/lib-core-mvi/src/main/java/ru/surfstudio/android/core/mvi/ui/middleware/dsl/transformers/MapTransformer.kt",
"diff": "+package ru.surfstudio.android.core.mvi.ui.middleware.dsl.transformers\n+\n+import io.reactivex.Observable\n+\n+class MapTransformer<T, E>(\n+ private val mapper: (T) -> E\n+) : StreamTransformer<T, E> {\n+\n+ override fun map(stream: Observable<T>): Observable<out E> {\n+ return stream.map { mapper(it) }\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "core-mvi/lib-core-mvi/src/main/java/ru/surfstudio/android/core/mvi/ui/middleware/dsl/transformers/ReactTransformer.kt",
"diff": "+package ru.surfstudio.android.core.mvi.ui.middleware.dsl.transformers\n+\n+import io.reactivex.Observable\n+\n+class ReactTransformer<T, E>(\n+ private val mapper: (T) -> Unit\n+) : StreamTransformer<T, E> {\n+\n+ override fun map(stream: Observable<T>): Observable<out E> {\n+ return stream.flatMap {\n+ mapper(it)\n+ Observable.empty<E>()\n+ }\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "core-mvi/lib-core-mvi/src/main/java/ru/surfstudio/android/core/mvi/ui/middleware/dsl/transformers/StreamMapTransformer.kt",
"diff": "+package ru.surfstudio.android.core.mvi.ui.middleware.dsl.transformers\n+\n+import io.reactivex.Observable\n+\n+class StreamMapTransformer<T, E>(\n+ private val mapper: (Observable<T>) -> Observable<out E>\n+) : StreamTransformer<T, E> {\n+\n+ override fun map(stream: Observable<T>): Observable<out E> {\n+ return mapper(stream)\n+ }\n+}\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-671 Add stream transformers |
652,316 | 03.10.2019 10:37:19 | -10,800 | fc0d4bf66091e5be3359f7c91e3369d911671297 | Rename middlewares + provide dsl without rx | [
{
"change_type": "MODIFY",
"old_path": "core-mvi/lib-core-mvi/src/main/java/ru/surfstudio/android/core/mvi/ui/middleware/dsl/EventTransformerList.kt",
"new_path": "core-mvi/lib-core-mvi/src/main/java/ru/surfstudio/android/core/mvi/ui/middleware/dsl/EventTransformerList.kt",
"diff": "@@ -2,10 +2,10 @@ package ru.surfstudio.android.core.mvi.ui.middleware.dsl\nimport io.reactivex.Observable\nimport ru.surfstudio.android.core.mvi.event.Event\n-import ru.surfstudio.android.core.mvi.ui.middleware.dsl.transformers.EventMapTransformer\n-import ru.surfstudio.android.core.mvi.ui.middleware.dsl.transformers.MapTransformer\n-import ru.surfstudio.android.core.mvi.ui.middleware.dsl.transformers.ReactTransformer\n-import ru.surfstudio.android.core.mvi.ui.middleware.dsl.transformers.StreamMapTransformer\n+import ru.surfstudio.android.core.mvi.ui.middleware.dsl.transformers.rx.EventMapTransformer\n+import ru.surfstudio.android.core.mvi.ui.middleware.dsl.transformers.rx.MapTransformer\n+import ru.surfstudio.android.core.mvi.ui.middleware.dsl.transformers.rx.ReactTransformer\n+import ru.surfstudio.android.core.mvi.ui.middleware.dsl.transformers.rx.StreamMapTransformer\nimport ru.surfstudio.android.core.mvi.util.filterIsInstance\nimport kotlin.reflect.KClass\n"
},
{
"change_type": "RENAME",
"old_path": "core-mvi/lib-core-mvi/src/main/java/ru/surfstudio/android/core/mvi/ui/middleware/dsl/transformers/EventMapTransformer.kt",
"new_path": "core-mvi/lib-core-mvi/src/main/java/ru/surfstudio/android/core/mvi/ui/middleware/dsl/transformers/rx/EventMapTransformer.kt",
"diff": "-package ru.surfstudio.android.core.mvi.ui.middleware.dsl.transformers\n+package ru.surfstudio.android.core.mvi.ui.middleware.dsl.transformers.rx\nimport io.reactivex.Observable\n"
},
{
"change_type": "RENAME",
"old_path": "core-mvi/lib-core-mvi/src/main/java/ru/surfstudio/android/core/mvi/ui/middleware/dsl/transformers/MapTransformer.kt",
"new_path": "core-mvi/lib-core-mvi/src/main/java/ru/surfstudio/android/core/mvi/ui/middleware/dsl/transformers/rx/MapTransformer.kt",
"diff": "-package ru.surfstudio.android.core.mvi.ui.middleware.dsl.transformers\n+package ru.surfstudio.android.core.mvi.ui.middleware.dsl.transformers.rx\nimport io.reactivex.Observable\n"
},
{
"change_type": "RENAME",
"old_path": "core-mvi/lib-core-mvi/src/main/java/ru/surfstudio/android/core/mvi/ui/middleware/dsl/transformers/ReactTransformer.kt",
"new_path": "core-mvi/lib-core-mvi/src/main/java/ru/surfstudio/android/core/mvi/ui/middleware/dsl/transformers/rx/ReactTransformer.kt",
"diff": "-package ru.surfstudio.android.core.mvi.ui.middleware.dsl.transformers\n+package ru.surfstudio.android.core.mvi.ui.middleware.dsl.transformers.rx\nimport io.reactivex.Observable\n"
},
{
"change_type": "RENAME",
"old_path": "core-mvi/lib-core-mvi/src/main/java/ru/surfstudio/android/core/mvi/ui/middleware/dsl/transformers/StreamMapTransformer.kt",
"new_path": "core-mvi/lib-core-mvi/src/main/java/ru/surfstudio/android/core/mvi/ui/middleware/dsl/transformers/rx/StreamMapTransformer.kt",
"diff": "-package ru.surfstudio.android.core.mvi.ui.middleware.dsl.transformers\n+package ru.surfstudio.android.core.mvi.ui.middleware.dsl.transformers.rx\nimport io.reactivex.Observable\n"
},
{
"change_type": "RENAME",
"old_path": "core-mvi/lib-core-mvi/src/main/java/ru/surfstudio/android/core/mvi/ui/middleware/dsl/transformers/StreamTransformer.kt",
"new_path": "core-mvi/lib-core-mvi/src/main/java/ru/surfstudio/android/core/mvi/ui/middleware/dsl/transformers/rx/StreamTransformer.kt",
"diff": "-package ru.surfstudio.android.core.mvi.ui.middleware.dsl.transformers\n+package ru.surfstudio.android.core.mvi.ui.middleware.dsl.transformers.rx\nimport io.reactivex.Observable\n"
},
{
"change_type": "MODIFY",
"old_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/base/middleware/BaseMiddleware.kt",
"new_path": "core-mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/base/middleware/BaseMiddleware.kt",
"diff": "@@ -4,7 +4,7 @@ import io.reactivex.Observable\nimport ru.surfstudio.android.core.mvi.event.Event\nimport ru.surfstudio.android.core.mvi.sample.ui.base.middleware.dependency.BaseMiddlewareDependency\nimport ru.surfstudio.android.core.mvi.ui.middleware.RxMiddleware\n-import ru.surfstudio.android.core.mvi.ui.middleware.dsl.EventTransformerListDslMiddleware\n+import ru.surfstudio.android.core.mvi.ui.middleware.dsl.BaseDslRxMiddleware\nimport ru.surfstudio.android.core.mvp.binding.rx.builders.RxBuilderHandleError\nimport ru.surfstudio.android.core.mvp.binding.rx.builders.RxBuilderIo\nimport ru.surfstudio.android.core.mvp.binding.rx.builders.UiBuilderFinish\n@@ -18,7 +18,7 @@ import ru.surfstudio.android.rx.extension.scheduler.SchedulersProvider\n*/\nabstract class BaseMiddleware<T : Event>(\nbaseMiddlewareDependency: BaseMiddlewareDependency\n-) : EventTransformerListDslMiddleware<T>,\n+) : BaseDslRxMiddleware<T>,\nRxBuilderIo,\nRxBuilderHandleError,\nUiBuilderFinish {\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-671 Rename middlewares + provide dsl without rx |
652,322 | 03.10.2019 12:56:16 | -10,800 | 68b2358ebfbab4b0957d5852404b49ed1e52ef6c | Changed PR and Deploy pipelines / fix dir | [
{
"change_type": "MODIFY",
"old_path": "ci-internal/JenkinsfilePullRequestJob.groovy",
"new_path": "ci-internal/JenkinsfilePullRequestJob.groovy",
"diff": "@@ -266,6 +266,7 @@ pipeline.stages = [\nscript.sh(\"./gradlew -p template clean build assembleQa --stacktrace\")\n},\npipeline.stage(CHECK_INSTRUMENTATION_TEST_TEMPLATE, StageStrategy.UNSTABLE_WHEN_STAGE_ERROR) {\n+ script.dir(\"template\") {\nAndroidPipelineHelper.instrumentationTestStageBodyAndroid(\nscript,\nnew AvdConfig(),\n@@ -273,13 +274,14 @@ pipeline.stages = [\ngetTestInstrumentationRunnerName,\nnew AndroidTestConfig(\n\"assembleAndroidTest\",\n- \"template/build/outputs/androidTest-results/instrumental\",\n- \"template/build/reports/androidTests/instrumental\",\n+ \"build/outputs/androidTest-results/instrumental\",\n+ \"build/reports/androidTests/instrumental\",\ntrue,\n0\n)\n)\n}\n+ }\n]\npipeline.finalizeBody = {\nif (pipeline.jobResult != Result.SUCCESS && pipeline.jobResult != Result.ABORTED) {\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-733 Changed PR and Deploy pipelines / fix dir |
652,322 | 04.10.2019 09:33:30 | -10,800 | 4eb8e8f495ba5d4ef0d489a66098ab3031ca5376 | Fix app archives name | [
{
"change_type": "MODIFY",
"old_path": "template/app/build.gradle",
"new_path": "template/app/build.gradle",
"diff": "@@ -29,7 +29,7 @@ android {\nversionCode config[\"versionCode\"]\nversionName config[\"versionName\"]\n- setProperty(\"archivesBaseName\", \"$applicationName-$versionName-($versionCode)\")\n+ setProperty(\"archivesBaseName\", \"$applicationName-$versionName-$versionCode\")\ntestBuildType 'debug' //todo replace to 'qa' for real app\n}\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-733 Fix app archives name |
652,322 | 04.10.2019 11:29:00 | -10,800 | 99297811ac3ff03dde64634fc9d9682288a4f842 | Remove archivesBaseName from template | [
{
"change_type": "MODIFY",
"old_path": "template/app/build.gradle",
"new_path": "template/app/build.gradle",
"diff": "@@ -29,8 +29,6 @@ android {\nversionCode config[\"versionCode\"]\nversionName config[\"versionName\"]\n- setProperty(\"archivesBaseName\", \"$applicationName-$versionName-$versionCode\")\n-\ntestBuildType 'debug' //todo replace to 'qa' for real app\n}\n}\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-733 Remove archivesBaseName from template |
652,315 | 08.10.2019 13:18:54 | -10,800 | ddd17c6b38662acddbcb177c3ebb70bef5d0f5c5 | Fixed debug screen push notification appearing on each App#onCreate invocation | [
{
"change_type": "MODIFY",
"old_path": "template/RELEASE_NOTES.md",
"new_path": "template/RELEASE_NOTES.md",
"diff": "* ANDDEP-702 Fixed script for local connection of android standard\n* ANDDEP-413 Added transition to WindowVQA on DebugScreen\n* ANDDEP-459 Added transition to application settings on DebugScreen\n+* Fixed debug screen push notification appearing on each App#onCreate invocation\n## 0.4.0\n##### Template\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Fixed debug screen push notification appearing on each App#onCreate invocation |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.