Improve GE instance option names

Author: gabrielfeo

README.md

@@ -16,8 +16,8 @@ api.getBuilds(since = yesterday).forEach {
 
 Set up once and use the library from any script in your machine:
 
-- `GRADLE_ENTERPRISE_URL` environment variable: the URL of your Gradle Enterprise instance
-- `GRADLE_ENTERPRISE_API_TOKEN` environment variable: an API access token for the Gradle
+- [`GRADLE_ENTERPRISE_URL`][16] environment variable: the URL of your Gradle Enterprise instance
+- [`GRADLE_ENTERPRISE_API_TOKEN`][17] environment variable: an API access token for the Gradle
   Enterprise instance. Alternatively, can be a macOS keychain entry labeled
   `gradle-enterprise-api-token` (recommended).
 
@@ -128,3 +128,5 @@ API classes such as `GradleEnterpriseApi` and response models are generated from
 [13]: https://gabrielfeo.github.io/gradle-enterprise-api-kotlin/gradle-enterprise-api-kotlin/com.gabrielfeo.gradle.enterprise.api/-options/-cache/index.html
 [14]: https://jitpack.io/#gabrielfeo/gradle-enterprise-api-kotlin
 [15]: https://gabrielfeo.github.io/gradle-enterprise-api-kotlin/
+[16]: https://gabrielfeo.github.io/gradle-enterprise-api-kotlin/gradle-enterprise-api-kotlin/com.gabrielfeo.gradle.enterprise.api/-options/-gradle-enterprise-instance/index.html#1947291631%2FProperties%2F769193423
+[17]: https://gabrielfeo.github.io/gradle-enterprise-api-kotlin/gradle-enterprise-api-kotlin/com.gabrielfeo.gradle.enterprise.api/-options/-gradle-enterprise-instance/index.html#-1521379912%2FProperties%2F769193423

src/main/kotlin/com/gabrielfeo/gradle/enterprise/api/Options.kt

@@ -23,18 +23,18 @@ object Options {
     object GradleEnterpriseInstance {
 
         /**
-         * Provides the URL of a Gradle Enterprise API instance. By default, uses environment variable
-         * `GRADLE_ENTERPRISE_URL`.
+         * Provides the URL of a Gradle Enterprise API instance (without `/api`). By default, uses
+         * environment variable `GRADLE_ENTERPRISE_URL`.
          */
-        var baseUrl: () -> String = {
+        var url: () -> String = {
             requireBaseUrl(envName = "GRADLE_ENTERPRISE_URL")
         }
 
         /**
          * Provides the access token for a Gradle Enterprise API instance. By default, uses keychain entry
          * `gradle-enterprise-api-token` or environment variable `GRADLE_ENTERPRISE_URL`.
          */
-        var accessToken: () -> String = {
+        var token: () -> String = {
             requireToken(
                 keychainName = "gradle-enterprise-api-token",
                 envName = "GRADLE_ENTERPRISE_API_TOKEN",

src/main/kotlin/com/gabrielfeo/gradle/enterprise/api/internal/OkHttpClient.kt

@@ -16,7 +16,7 @@ internal val okHttpClient: OkHttpClient by lazy {
         if (Options.Debugging.debugLoggingEnabled && Options.Cache.cacheEnabled) {
             addInterceptor(CacheHitLoggingInterceptor())
         }
-        addInterceptor(HttpBearerAuth("bearer", Options.GradleEnterpriseInstance.accessToken()))
+        addInterceptor(HttpBearerAuth("bearer", Options.GradleEnterpriseInstance.token()))
         if (Options.Cache.cacheEnabled) {
             addNetworkInterceptor(buildCacheEnforcingInterceptor())
         }

src/main/kotlin/com/gabrielfeo/gradle/enterprise/api/internal/Retrofit.kt

@@ -7,8 +7,10 @@ import retrofit2.converter.moshi.MoshiConverterFactory
 import retrofit2.converter.scalars.ScalarsConverterFactory
 
 internal val retrofit: Retrofit by lazy {
+    val url = Options.GradleEnterpriseInstance.url()
+    check("/api" !in url) { "Instance URL must be the plain instance URL, without /api" }
     Retrofit.Builder()
-        .baseUrl(Options.GradleEnterpriseInstance.baseUrl())
+        .baseUrl(url)
         .addConverterFactory(ScalarsConverterFactory.create())
         .addConverterFactory(MoshiConverterFactory.create(Serializer.moshi))
         .client(okHttpClient)