Skip to content

Commit a54db62

Browse files
authored
Merge pull request #59 from LeoAndo/feature/update_as_meerkat
Updated gradle to 8.11.1 and Android Studio to Meerkat.
2 parents 8ccbc8e + bfc1624 commit a54db62

File tree

12 files changed

+77
-13
lines changed

12 files changed

+77
-13
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919

2020
- uses: actions/checkout@v3
2121

22-
- name: set up JDK 11
22+
- name: set up JDK 17
2323
uses: actions/setup-java@v3
2424
with:
25-
java-version: '11'
25+
java-version: '17'
2626
distribution: 'temurin'
2727

2828
- name: Create local.properties

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@v3
1515

16-
- name: set up JDK 11
16+
- name: set up JDK 17
1717
uses: actions/setup-java@v3
1818
with:
19-
java-version: '11'
19+
java-version: '17'
2020
distribution: 'temurin'
2121
cache: gradle
2222

.idea/appInsightsSettings.xml

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

.idea/deploymentTargetSelector.xml

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

.idea/gradle.xml

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

.idea/migrations.xml

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

.idea/runConfigurations.xml

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

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1-
# Overview
1+
# overview
22

33
Kotlin未経験で、Android Javaでアプリ開発したい人向けのテンプレートプロジェクト<br>
44
productFlavorsでテンプレートを切り替える仕組みにしています。<br>
55
使い方など、詳しいことは以下のWikiにまとめています。<br>
66
https://github.com/LeoAndo/AndroidBasicApp/wiki<br>
77

8+
# develop environment
9+
Android Studio Meerkat
10+
811
# capture: Light Theme
912

1013
## pixel3a API 30

app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ android {
6060

6161
buildFeatures {
6262
viewBinding true
63+
buildConfig true
6364
}
6465

6566
flavorDimensions += "version"

app/src/main/java/com/template/androidbasicapp/ui/fragment/UiDemoFragment.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import android.widget.ArrayAdapter;
1616

1717
import com.google.android.material.snackbar.Snackbar;
18-
import com.template.androidbasicapp.AppLogger;
1918
import com.template.androidbasicapp.BuildConfig;
2019
import com.template.androidbasicapp.R;
2120
import com.template.androidbasicapp.data.Item;
@@ -28,7 +27,6 @@
2827

2928
import java.util.ArrayList;
3029
import java.util.Arrays;
31-
import java.util.Collections;
3230
import java.util.List;
3331
import java.util.Optional;
3432
import java.util.stream.Collectors;

0 commit comments

Comments
 (0)