Skip to content

Commit 431843b

Browse files
committed
Update packages and copyright
1 parent 90238ce commit 431843b

File tree

29 files changed

+629
-339
lines changed

29 files changed

+629
-339
lines changed

.github/ci-gradle.properties

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
11

22
#
3-
# Copyright 2020 The Android Open Source Project
3+
# Copyright (c) 2021 Olivier Patry
44
#
5-
# Licensed under the Apache License, Version 2.0 (the "License");
6-
# you may not use this file except in compliance with the License.
7-
# You may obtain a copy of the License at
5+
# Permission is hereby granted, free of charge, to any person obtaining
6+
# a copy of this software and associated documentation files (the "Software"),
7+
# to deal in the Software without restriction, including without limitation
8+
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
9+
# and/or sell copies of the Software, and to permit persons to whom the Software
10+
# is furnished to do so, subject to the following conditions:
811
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
12+
# The above copyright notice and this permission notice shall be included in
13+
# all copies or substantial portions of the Software.
1014
#
11-
# Unless required by applicable law or agreed to in writing, software
12-
# distributed under the License is distributed on an "AS IS" BASIS,
13-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
# See the License for the specific language governing permissions and
15-
# limitations under the License.
15+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
16+
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
17+
# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
18+
# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
19+
# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
20+
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
21+
# OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1622
#
1723

1824
org.gradle.daemon=false

app/build.gradle

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
/*
2+
* Copyright (c) 2021 Olivier Patry
3+
*
4+
* Permission is hereby granted, free of charge, to any person obtaining
5+
* a copy of this software and associated documentation files (the "Software"),
6+
* to deal in the Software without restriction, including without limitation
7+
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
8+
* and/or sell copies of the Software, and to permit persons to whom the Software
9+
* is furnished to do so, subject to the following conditions:
10+
*
11+
* The above copyright notice and this permission notice shall be included in
12+
* all copies or substantial portions of the Software.
13+
*
14+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
15+
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
16+
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
17+
* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
18+
* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
19+
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
20+
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
21+
*/
22+
123
plugins {
224
id 'com.android.application'
325
id 'kotlin-android'
@@ -7,7 +29,7 @@ android {
729
compileSdkVersion 30
830

931
defaultConfig {
10-
applicationId "com.example.androiddevchallenge"
32+
applicationId "net.opatry.speedrun.emea"
1133
minSdkVersion 23
1234
targetSdkVersion 30
1335
versionCode 1
@@ -84,4 +106,9 @@ dependencies {
84106
implementation "androidx.navigation:navigation-compose:1.0.0-alpha08"
85107

86108
implementation "dev.chrisbanes.accompanist:accompanist-coil:0.6.1"
109+
110+
testImplementation 'junit:junit:4.13.2'
111+
112+
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
113+
androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
87114
}

app/src/androidTest/java/com/example/androiddevchallenge/ExampleInstrumentedTest.kt

Lines changed: 0 additions & 38 deletions
This file was deleted.
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
/*
2+
* Copyright (c) 2021 Olivier Patry
3+
*
4+
* Permission is hereby granted, free of charge, to any person obtaining
5+
* a copy of this software and associated documentation files (the "Software"),
6+
* to deal in the Software without restriction, including without limitation
7+
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
8+
* and/or sell copies of the Software, and to permit persons to whom the Software
9+
* is furnished to do so, subject to the following conditions:
10+
*
11+
* The above copyright notice and this permission notice shall be included in
12+
* all copies or substantial portions of the Software.
13+
*
14+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
15+
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
16+
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
17+
* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
18+
* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
19+
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
20+
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
21+
*/
22+
package net.opatry.speedrun.emea
23+
24+
import androidx.compose.ui.test.junit4.createAndroidComposeRule
25+
import androidx.test.ext.junit.runners.AndroidJUnit4
26+
import org.junit.Rule
27+
import org.junit.Test
28+
import org.junit.runner.RunWith
29+
30+
/**
31+
* Instrumented test, which will execute on an Android device.
32+
*
33+
* See [testing documentation](http://d.android.com/tools/testing).
34+
*/
35+
@RunWith(AndroidJUnit4::class)
36+
class ExampleInstrumentedTest {
37+
@get:Rule
38+
val composeTestRule = createAndroidComposeRule<MainActivity>()
39+
40+
@Test
41+
fun sampleTest() {
42+
// Add instrumented tests here
43+
}
44+
}

app/src/main/AndroidManifest.xml

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,28 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!--
3-
Copyright 2020 The Android Open Source Project
4-
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
5-
in compliance with the License. You may obtain a copy of the License at
6-
http://www.apache.org/licenses/LICENSE-2.0
7-
Unless required by applicable law or agreed to in writing, software distributed under the License
8-
is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
9-
or implied. See the License for the specific language governing permissions and limitations under
10-
the License.
3+
Copyright (c) 2021 Olivier Patry
4+
5+
Permission is hereby granted, free of charge, to any person obtaining
6+
a copy of this software and associated documentation files (the "Software"),
7+
to deal in the Software without restriction, including without limitation
8+
the rights to use, copy, modify, merge, publish, distribute, sublicense,
9+
and/or sell copies of the Software, and to permit persons to whom the Software
10+
is furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in
13+
all copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
16+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
17+
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
18+
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
19+
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
20+
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
21+
OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1122
-->
1223

1324
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
14-
package="com.example.androiddevchallenge">
25+
package="net.opatry.speedrun.emea">
1526

1627
<application
1728
android:allowBackup="true"
@@ -20,7 +31,7 @@
2031
android:supportsRtl="true"
2132
android:theme="@style/Theme.AndroidDevChallenge">
2233
<activity
23-
android:name="com.example.androiddevchallenge.MainActivity"
34+
android:name="net.opatry.speedrun.emea.MainActivity"
2435
android:label="@string/app_name"
2536
android:theme="@style/Theme.AndroidDevChallenge.NoActionBar">
2637
<intent-filter>

app/src/main/java/com/example/androiddevchallenge/MainActivity.kt

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

app/src/main/java/com/example/androiddevchallenge/ui/theme/Color.kt

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

app/src/main/java/com/example/androiddevchallenge/ui/theme/Shape.kt

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

app/src/main/java/com/example/androiddevchallenge/ui/theme/Theme.kt

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

0 commit comments

Comments
 (0)