Skip to content

Commit adad071

Browse files
authored
Merge pull request #4186 from owncloud/fix/updateRepoDocs
Update some files after removing submodule
2 parents c3f3f7a + d649fe1 commit adad071

3 files changed

Lines changed: 1 addition & 13 deletions

File tree

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,3 @@ Add any other context or screenshots about the feature request here.
3131
- [ ] Design test plan
3232
- [ ] QA
3333
- [ ] Merge branch feature/feature_name into master
34-
35-
### PR
36-
37-
- App
38-
- Library (if needed)

.github/ISSUE_TEMPLATE/release_template.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ For OEM releases, keep the OEM Release template and remove the Open Release one
1919
- [ ] [DOC] Ping in #documentation-internal about the new release
2020
- [ ] [GIT] Create branch `release/M.m.p` in owncloud/android from master
2121
- [ ] [GIT] Rebase `release/M.m.p` against `stable` in owncloud/android
22-
- [ ] [GIT] Create branch `release/x.y.z` in owncloud/android-library from master
23-
- [ ] [GIT] Rebase `release/x.y.z` against `stable` in owncloud/android-library
2422
- [ ] [DEV] Update version number and name in build.gradle in owncloudApp module
2523
- [ ] [DEV] Update [SBOM](https://cloud.owncloud.com/f/6072870)
2624
- [ ] [DIS] Create a folder for the new version like `M.m.p_YYYY-MM-DD` inside the `changelog` folder
@@ -36,16 +34,13 @@ For OEM releases, keep the OEM Release template and remove the Open Release one
3634
- [ ] [DIS] Upload release APK and bundle to internal owncloud instance
3735
- [ ] [DOC] Ping in #documentation-internal that we are close to sign the new tags
3836
- [ ] [GIT] Create and sign tag `vM.m.p` in HEAD commit of release branch, in owncloud/android
39-
- [ ] [GIT] Create and sign tag `vx.y.z` in HEAD commit of release branch, in owncloud/android-library
4037
- [ ] [DIS] Upload & publish release bundle and changelog in Play Store
4138
- [ ] [DIS] Update screenshots and store listing, if needed, in Play Store
4239
- [ ] [GIT] Publish a new release in [owncloud/android](https://github.com/owncloud/android/releases)
4340
- [ ] [DIS] Release published in Play Store
4441
- [ ] [DIS] Publish post in central.owncloud.org ([`Category:News + Tag:android`](https://central.owncloud.org/tags/c/news/5/android))
4542
- [ ] [COM] Inform `#updates` and `#marketing` in internal chat that release is out
46-
- [ ] [GIT] Merge `release/M.m.p` branch into `stable`, in owncloud/android-library
4743
- [ ] [GIT] Merge `release/M.m.p` branch into `stable`, in owncloud/android
48-
- [ ] [GIT] Merge `release/M.m.p` branch into `master`, in owncloud/android-library
4944
- [ ] [GIT] Merge `release/M.m.p` branch into `master`, in owncloud/android
5045
- [ ] [DOC] Update documentation with new stuff by creating [issue](https://github.com/owncloud/docs-client-android/issues)
5146

SETUP.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Next steps will assume you have a Github account and that you will get the code
3434

3535
* In a web browser, go to https://github.com/owncloud/android, and click the 'Fork' button near the top right corner.
3636
* Open a terminal and go on with the next steps in it.
37-
* Clone your forked repository: ```git clone --recursive https://github.com/YOURGITHUBNAME/android.git```.
37+
* Clone your forked repository: ```git clone https://github.com/YOURGITHUBNAME/android.git```.
3838
* Move to the project folder with ```cd android```.
3939
* Fetch and apply any changes from your remote branch 'master': ```git fetch``` + ```git rebase```
4040
* Make official ownCloud repo known as upstream: ```git remote add upstream https://github.com/owncloud/android.git```
@@ -51,7 +51,6 @@ We recommend to use the last version available in the stable channel of Android
5151

5252
To set up the project in Android Studio follow the next steps:
5353

54-
* Make sure you have called ```git submodule update``` whenever you switched branches
5554
* Open Android Studio and select 'Import Project (Eclipse ADT, Gradle, etc)'. Browse through your file system to the folder 'android' where the project is located. Android Studio will then create the '.iml' files it needs. If you ever close the project but the files are still there, you just select 'Open Project...'. The file chooser will show an Android face as the folder icon, which you can select to reopen the project.
5655
* Android Studio will try to build the project directly after importing it. To build it manually, follow the menu path 'Build'/'Make Project', or just click the 'Play' button in the tool bar to build and run it in a mobile device or an emulator. The resulting APK file will be saved in the 'build/outputs/apk/' subdirectory in the project folder.
5756

@@ -61,7 +60,6 @@ To set up the project in Android Studio follow the next steps:
6160
[Gradle][6] is the build system used by Android Studio to manage the building operations on Android apps. You do not need to install Gradle in your system, and Google recommends not to do it, but instead trusting on the [Gradle wrapper][7] included in the project.
6261

6362
* Open a terminal and go to the 'android' directory that contains the repository.
64-
* Make sure you have called ```git submodule update``` whenever you switched branches
6563
* Run the 'clean' and 'build' tasks using the Gradle wrapper provided
6664
- Windows: ```gradlew.bat clean build```
6765
- Mac OS/Linux: ```./gradlew clean build```

0 commit comments

Comments
 (0)