Skip to content
This repository was archived by the owner on Nov 12, 2025. It is now read-only.

Commit 7f3e5a8

Browse files
authored
Merge pull request #5 from scorebet/vkondrav/merge/v2.1.0
Apollo Release 2.1.0
2 parents 12c514d + 71fd36d commit 7f3e5a8

File tree

967 files changed

+103812
-36851
lines changed

Some content is hidden

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

967 files changed

+103812
-36851
lines changed

.buildscript/deploy_snapshot.sh

Lines changed: 0 additions & 26 deletions
This file was deleted.
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: 'Type: Bug'
6+
assignees: ''
7+
8+
---
9+
10+
**Summary**
11+
A clear and concise description of what the bug is.
12+
13+
**Description**
14+
Add any context about the problem here.
15+
16+
**Version**
17+
Provide a version of library on which the problem occurred.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: 'Type: Feature'
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12+
13+
**Describe the solution you'd like**
14+
A clear and concise description of what you want to happen.

.github/workflows/ci.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
pull_request:
6+
paths-ignore:
7+
- 'docs/**'
8+
- '*.md'
9+
10+
jobs:
11+
build:
12+
13+
runs-on: macOS-latest
14+
15+
steps:
16+
- uses: actions/checkout@v2
17+
- name: set up JDK 1.8
18+
uses: actions/setup-java@v1
19+
with:
20+
java-version: 1.8
21+
- name: Build with Gradle
22+
run: ./scripts/ci.sh
23+
env: # Or as an environment variable
24+
BINTRAY_API_KEY: ${{ secrets.BINTRAY_API_KEY }}
25+
BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
26+
SONATYPE_NEXUS_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
27+
SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
28+
GRADLE_PUBLISH_KEY: ${{ secrets.GRADLE_PUBLISH_KEY }}
29+
GRADLE_PUBLISH_SECRET: ${{ secrets.GRADLE_PUBLISH_SECRET }}

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
.gradle
2+
**/.idea/.name
23
**/.idea/*.xml
34
**/.idea/caches/
45
**/.idea/copyright/
56
**/.idea/inspectionProfiles/
67
**/.idea/libraries/
78
**/.idea/$PRODUCT_WORKSPACE_FILE$
89
**/.idea/.gitignore
10+
**/.idea/artifacts/
911
*.iml
1012
build
1113
local.properties
1214
/reports
13-
node_modules/
1415
generated
1516

1617
.DS_Store
@@ -26,3 +27,4 @@ package-lock.json
2627
**/.project
2728
.vscode/**
2829
**/bin
30+
.sqldelight

.idea/codeStyles/Project.xml

Lines changed: 17 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/codeStyles/codeStyleConfig.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.travis.yml

Lines changed: 0 additions & 60 deletions
This file was deleted.

Contributing.md

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,19 @@
11
Contributing to Apollo Android GraphQL
2-
=======================
2+
======================================
33

44
The Apollo team welcomes contributions of all kinds, from simple bug reports through documentation, test cases,
55
bugfixes, and features.
66

7-
If you instead have a usage question kindly ask on Stackoverflow.com using the tag [apollo-android]
7+
If you instead have a usage question kindly ask on Stackoverflow.com using the tag [apollo-android]
8+
9+
Project Setup
10+
-------------
11+
12+
This project is being developed using IntelliJ IDEA or Android Studio. With [introduction of Kotlin Multiplatform](https://github.com/apollographql/apollo-android/blob/master/apollo-api/build.gradle.kts#L10-L21),
13+
build may require installation of xcodebuild tools and Xcode 11.
14+
15+
It is recommended to import/open `composite` instead of root folder since that includes `apollo-integration` tests
16+
and all sample projects under `samples` folder by using Gradle Composite builds.
817

918
DOs and DON'Ts
1019
--------------
@@ -25,7 +34,7 @@ DOs and DON'Ts
2534
Coding Style
2635
------------
2736

28-
The coding style employed here is fairly conventional Java - indentations are four spaces, class
37+
The coding style employed here is fairly conventional Kotlin - indentations are 2 spaces, class
2938
names are PascalCased, identifiers and methods are camelCased.
3039

3140
Workflow
@@ -38,4 +47,9 @@ Small pull requests for things like typos, bugfixes, etc are always welcome.
3847

3948
Please note that we will not accept pull requests for style changes.
4049

50+
Releasing
51+
--------
52+
53+
The CI contains credentials and will push artifacts to bintray/sonatype/gradlePortal when a tag is pushed. Every tag will trigger a new release.
4154

55+
After a successful release, do not forget to add a changelog to the [releases page](https://github.com/apollographql/apollo-android/releases).

0 commit comments

Comments
 (0)