Skip to content

Commit 2cb9afe

Browse files
committed
AGP 8.10.0
1 parent 1db2260 commit 2cb9afe

File tree

7 files changed

+58
-63
lines changed

7 files changed

+58
-63
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Only GitHub traffic is being permitted, see [`network_security_config.xml`](mobi
2525

2626
The [`:library`](library/src/main/java/io/syslogic/github/api) module is available on JitPack; either by version tag or `master-SNAPSHOT`.<br/>
2727
It provides the relevant GitHub API calls & data-models with data-binding annotations.<br/>
28-
The JitPack repository URL would be: `maven { url 'https://jitpack.io' }`
28+
The JitPack repository URL would be: `maven { url = uri("https://jitpack.io") }`
2929

3030
dependencies {
3131
// implementation "io.syslogic:androidx-github:master-SNAPSHOT"

gradle.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,3 @@ org.gradle.welcome=never
99

1010
android.useAndroidX=true
1111
android.enableJetifier=false
12-
13-
android.suppressUnsupportedCompileSdk=35

gradle/libs.versions.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
[versions]
22
app_version_code = '4'
3-
app_version_name = '1.0.4'
4-
android_build_tools = '35.0.0'
5-
android_compile_sdk = '35'
6-
android_target_sdk = '35'
3+
app_version_name = '1.0.5'
4+
android_build_tools = '36.0.0'
5+
android_compile_sdk = '36'
6+
android_target_sdk = '36'
77
android_min_sdk = '22'
88

99
# Gradle Plugins
10-
android_gradle_plugin = '8.9.0'
11-
kotlin = '2.0.21'
10+
android_gradle_plugin = '8.10.0'
11+
kotlin = '2.1.20'
1212
material_design = '1.12.0'
1313
retrofit = '2.11.0'
14-
gson = '2.11.0'
14+
gson = '2.12.1'
1515
junit = '4.13.2'
1616
flexbox = '3.0.0'
1717
# Note: DirCacheCheckout.java uses InputStream.transferTo() since jgit 6.3; no such method on Android.
1818
jgit = '6.2.0.202206071550-r'
1919
slf4j = '2.0.16'
2020
androidx_appcompat = '1.7.0'
2121
androidx_annotation = '1.9.1'
22-
androidx_navigation = '2.8.9'
22+
androidx_navigation = '2.9.0'
2323
androidx_fragment = '1.8.6'
2424
androidx_recyclerview = '1.4.0'
2525
androidx_cardview = '1.0.0'
2626
androidx_preference = '1.2.1'
27-
androidx_room = '2.6.1'
27+
androidx_room = '2.7.1'
2828
androidx_splashscreen = '1.0.1'
2929
androidx_test_junit = '1.2.1'
3030
androidx_test_core = '1.6.1'
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Mon May 15 03:22:49 CEST 2023
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

library/build.gradle

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ plugins {
44
id 'maven-publish'
55
}
66

7+
group = 'io.syslogic'
8+
version = libs.versions.app.version.name.get()
9+
710
base {
811
String versionName = libs.versions.app.version.name.get()
912
archivesName = "androidx_github_$versionName"
@@ -28,8 +31,8 @@ android {
2831
}
2932

3033
compileOptions {
31-
sourceCompatibility JavaVersion.VERSION_17
32-
targetCompatibility JavaVersion.VERSION_17
34+
sourceCompatibility = JavaVersion.VERSION_17
35+
targetCompatibility = JavaVersion.VERSION_17
3336
}
3437

3538
buildFeatures {
@@ -67,31 +70,31 @@ android {
6770
dependencies {
6871

6972
// Material Design Components
70-
implementation libs.material.design
73+
implementation(libs.material.design)
7174

7275
// Annotations
73-
implementation libs.androidx.annotation
76+
implementation(libs.androidx.annotation)
7477

7578
// App Compat
76-
implementation libs.androidx.appcompat
79+
implementation(libs.androidx.appcompat)
7780

7881
// Data-Binding Runtime
79-
implementation libs.androidx.databinding
82+
implementation(libs.androidx.databinding)
8083

8184
// Room Runtime
82-
annotationProcessor libs.androidx.room.compiler
83-
testImplementation libs.androidx.room.testing
84-
implementation libs.androidx.room.runtime
85+
annotationProcessor(libs.androidx.room.compiler)
86+
testImplementation(libs.androidx.room.testing)
87+
implementation(libs.androidx.room.runtime)
8588

8689
// Retrofit2
87-
implementation libs.gson
88-
implementation libs.retrofit
89-
implementation (libs.retrofit.gson.converter) {
90-
exclude group: "com.google.code.gson", module: "gson"
90+
implementation(libs.gson)
91+
implementation(libs.retrofit)
92+
implementation(libs.retrofit.gson.converter) {
93+
exclude(group: "com.google.code.gson", module: "gson")
9194
}
9295

93-
testImplementation libs.junit
94-
androidTestImplementation libs.androidx.test.junit
96+
testImplementation(libs.junit)
97+
androidTestImplementation(libs.androidx.test.junit)
9598
}
9699

97100
tasks.register('javadoc', Javadoc) {
@@ -105,7 +108,7 @@ tasks.register('javadoc', Javadoc) {
105108
android.getBootClasspath().forEach{ classpath += fileTree(it) }
106109
classpath += fileTree(dir: project.file("build/tmp/aarsToJars/").absolutePath)
107110
classpath += configurations.implementation
108-
exclude "**/BuildConfig.java", "**/R.java", "**/*.kt"
111+
exclude("**/BuildConfig.java", "**/R.java", "**/*.kt")
109112
failOnError = false
110113

111114
// options.verbose()
@@ -116,6 +119,10 @@ tasks.register('javadoc', Javadoc) {
116119
options.linkSource true
117120
options.author true
118121

122+
onlyIf {
123+
project.file("build/intermediates/aar_main_jar").exists()
124+
}
125+
119126
doFirst {
120127

121128
// extract AAR files
@@ -141,33 +148,26 @@ tasks.register('javadoc', Javadoc) {
141148
}
142149
doLast {
143150
// delete temporary directory.
144-
delete project.fileTree('build/tmp7aarsToJars')
151+
delete project.fileTree("build/tmp/aarsToJars")
145152
}
146153
}
147154

148-
javadoc.onlyIf {
149-
project.file("build/intermediates/aar_main_jar").exists()
150-
}
151-
152-
tasks.register('javadocJar', Jar) {
153-
dependsOn javadoc
154-
archiveClassifier.set('javadoc')
155-
from javadoc.destinationDir
155+
tasks.register("javadocJar", Jar) {
156+
dependsOn(javadoc)
157+
archiveClassifier.set("javadoc")
158+
from(javadoc.destinationDir)
156159
}
157160

158161
tasks.register('sourcesJar', Jar) {
159-
from android.sourceSets.main.java.srcDirs
162+
from(android.sourceSets.main.java.srcDirs)
160163
archiveClassifier.set('sources')
161164
}
162165

163166
artifacts {
164-
archives javadocJar
165-
archives sourcesJar
167+
archives(javadocJar)
168+
archives(sourcesJar)
166169
}
167170

168-
group = 'io.syslogic'
169-
version = libs.versions.app.version.name.get()
170-
171171
afterEvaluate {
172172
publishing {
173173
publications {

mobile/src/main/java/io/syslogic/github/recyclerview/QueryStringsAdapter.java

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import io.syslogic.github.activity.BaseActivity;
2424
import io.syslogic.github.api.model.QueryString;
2525
import io.syslogic.github.api.room.Abstraction;
26+
import io.syslogic.github.api.room.QueryStringsDao;
2627
import io.syslogic.github.databinding.CardviewQueryStringBinding;
2728

2829
/**
@@ -40,19 +41,15 @@ public class QueryStringsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
4041
/** Debug Output */
4142
static final boolean mDebug = BuildConfig.DEBUG;
4243

43-
private WeakReference<Context> mContext;
44-
private RecyclerView mRecyclerView;
44+
private final WeakReference<Context> mContext;
4545
private List<QueryString> mItems;
4646

4747
public QueryStringsAdapter(@NonNull Context context) {
4848
this.mContext = new WeakReference<>(context);
49-
Abstraction.executorService.execute(() -> mItems = Abstraction.getInstance(getContext()).queryStringsDao().getItems());
50-
}
51-
52-
@Override
53-
public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
54-
super.onAttachedToRecyclerView(recyclerView);
55-
this.mRecyclerView = recyclerView;
49+
Abstraction.executorService.execute(() -> {
50+
QueryStringsDao dao = Abstraction.getInstance(getContext()).queryStringsDao();
51+
if (dao != null) {mItems = dao.getItems();}
52+
});
5653
}
5754

5855
@NonNull
@@ -98,7 +95,6 @@ protected Context getContext() {
9895
private static class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
9996

10097
private final CardviewQueryStringBinding mDataBinding;
101-
private QueryStringsLinearView mRecyclerView;
10298
private CardView cardView;
10399
private long itemId;
104100

@@ -118,9 +114,9 @@ private static class ViewHolder extends RecyclerView.ViewHolder implements View.
118114

119115
@Override
120116
public void onClick(@NonNull View viewHolder) {
121-
this.mRecyclerView = (QueryStringsLinearView) viewHolder.getParent();
117+
QueryStringsLinearView mRecyclerView = (QueryStringsLinearView) viewHolder.getParent();
122118
QueryString item = (QueryString) viewHolder.getTag();
123-
BaseActivity activity = (BaseActivity) this.mRecyclerView.getContext();
119+
BaseActivity activity = (BaseActivity) mRecyclerView.getContext();
124120
ViewDataBinding databinding = activity.getFragmentDataBinding();
125121
if (databinding != null) {
126122
Bundle args = new Bundle();
@@ -134,6 +130,7 @@ public void onClick(@NonNull View viewHolder) {
134130
public void setId(long value) {
135131
this.itemId = value;
136132
}
133+
137134
void setCardView(CardView view) {
138135
this.cardView = view;
139136
}
@@ -142,6 +139,7 @@ void setCardView(CardView view) {
142139
public long getId() {
143140
return this.itemId;
144141
}
142+
145143
CardviewQueryStringBinding getDataBinding() {
146144
return this.mDataBinding;
147145
}

settings.gradle renamed to settings.gradle.kts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,21 @@ pluginManagement {
66
}
77
}
88

9+
@Suppress("UnstableApiUsage")
910
dependencyResolutionManagement {
1011
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
1112
repositories {
12-
maven {
13-
url = "https://repo.eclipse.org/content/groups/releases/"
14-
}
13+
maven { url = uri("https://repo.eclipse.org/content/groups/releases/") }
1514
mavenCentral()
1615
google()
1716
}
1817
}
1918

2019
rootProject.name = "GitHub Client"
2120

22-
include ":library"
21+
include(":library")
2322

24-
/* JitPack: exclude module. */
25-
if (! System.env.JITPACK) {
26-
include ":mobile"
23+
/* JitPack: exclude module `:mobile` */
24+
if (System.getenv("JITPACK") == null) {
25+
include(":mobile")
2726
}

0 commit comments

Comments
 (0)