Skip to content

Commit ba3f03e

Browse files
committedSep 24, 2019
Updating Licence, readme and .gitignore for launch
Change-Id: Iddf6e7f01b5d92aca07aea974310982b26e6ca3a
1 parent ce99939 commit ba3f03e

File tree

3 files changed

+47
-34
lines changed

3 files changed

+47
-34
lines changed
 

‎.gitignore

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# built application files
2+
*.apk
3+
*.ap_
4+
5+
# Mac files
6+
.DS_Store
7+
8+
# files for the dex VM
9+
*.dex
10+
11+
# Java class files
12+
*.class
13+
14+
# generated files
15+
bin/
16+
gen/
17+
18+
# Ignore gradle files
19+
.gradle/
20+
build/
21+
22+
# Local configuration file (sdk path, etc)
23+
local.properties
24+
25+
# Proguard folder generated by Eclipse
26+
proguard/
27+
proguard-project.txt
28+
29+
# Eclipse files
30+
.project
31+
.classpath
32+
.settings/
33+
34+
# Android Studio/IDEA
35+
*.iml
36+
.idea

‎LICENSE

+3-14
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
Apache License
21
Version 2.0, January 2004
32
http://www.apache.org/licenses/
43

@@ -175,18 +174,7 @@
175174

176175
END OF TERMS AND CONDITIONS
177176

178-
APPENDIX: How to apply the Apache License to your work.
179-
180-
To apply the Apache License to your work, attach the following
181-
boilerplate notice, with the fields enclosed by brackets "[]"
182-
replaced with your own identifying information. (Don't include
183-
the brackets!) The text should be enclosed in the appropriate
184-
comment syntax for the file format. We also recommend that a
185-
file or class name and description of purpose be included on the
186-
same "printed page" as the copyright notice for easier
187-
identification within third-party archives.
188-
189-
Copyright 2015 Google Inc.
177+
Copyright 2019 Google LLC
190178

191179
Licensed under the Apache License, Version 2.0 (the "License");
192180
you may not use this file except in compliance with the License.
@@ -198,4 +186,5 @@
198186
distributed under the License is distributed on an "AS IS" BASIS,
199187
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200188
See the License for the specific language governing permissions and
201-
limitations under the License.
189+
limitations under the License.
190+

‎README.md

+8-20
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,11 @@
1-
#Compose samples
1+
Compose Samples Repository
2+
=====================
23

3-
### License
4+
This repository contains a set of individual Android Studio projects to help you learn about
5+
Compose in Android.
46

7+
For more information, please [read our documentation](https://developer.android.com/jetpack/compose)
58

6-
```
7-
Copyright 2019 Google, Inc.
8-
9-
Licensed to the Apache Software Foundation (ASF) under one or more contributor
10-
license agreements. See the NOTICE file distributed with this work for
11-
additional information regarding copyright ownership. The ASF licenses this
12-
file to you under the Apache License, Version 2.0 (the "License"); you may not
13-
use this file except in compliance with the License. You may obtain a copy of
14-
the License at
15-
16-
http://www.apache.org/licenses/LICENSE-2.0
17-
18-
Unless required by applicable law or agreed to in writing, software
19-
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
20-
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
21-
License for the specific language governing permissions and limitations under
22-
the License.
23-
```
9+
Samples
10+
-------
11+
[Jetnews](JetNews/): A sample blog post viewer that demonstrates the use of Compose.

0 commit comments

Comments
 (0)